[monkey-bubble: 419/753] Fix preprocessor screwiness (i.e., ##foo## -> ## foo) Change #include

[Sven Herzberg <herzi src gnome org>]

commit 2ded60f83ef7f3680b156bb2cc72940cd5c1ed8f
Author: Cody Russell <bratsche src gnome org>
Date:   Sun Jun 10 16:06:38 2001 +0000

    Fix preprocessor screwiness (i.e., ##foo## -> ## foo) Change #include
    
    * Fix preprocessor screwiness (i.e., ##foo## -> ## foo)
    * Change #include <bonobo-config/foo.h> to #include <bonobo-conf/foo.h>
    * Add #include <stdlib.h> for exit() where needed.

 ChangeLog                    |   13 +++++++++++++
 libgnome/gnome-preferences.c |    8 ++++----
 monikers/desktop-item-boot.c |    1 +
 monikers/test-ditem.c        |    1 +
 4 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 721c03b..eeb69b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2001-06-10  Cody Russell  <bratsche gnome org>
+
+	* libgnome/gnome-preferences: Change preprocessor pasting from ##t##
+	to just ## t.
+
+	* monikers/bonobo-config-ditem-utils.c: #include <bonobo-conf/foo> instead of
+	<bonobo-config/foo>.  Fix preprocessor pasting.
+
+	* monikers/bonobo-config-ditem.[ch], bonobo-moniker-ditem.c: Change #include 
+	<bonobo-config/foo> to <bonobo-conf/foo>
+
+	* monikers/desktop-item-boot.c, test-ditem.c: Add #include <stdlib.h> for exit().
+
 2001-06-10  Martin Baulig  <baulig suse de>
 
 	* Makefile.am (SUBDIRS): Compile the monikers/ subdir by default.
diff --git a/libgnome/gnome-preferences.c b/libgnome/gnome-preferences.c
index 6a8417d..bded025 100644
--- a/libgnome/gnome-preferences.c
+++ b/libgnome/gnome-preferences.c
@@ -49,14 +49,14 @@ desktop_property_set_boolean (const gchar *name, gboolean value)
 
 #define DEFINE_DESKTOP_PROP_BOOLEAN(c_name, prop_name)  \
 gboolean                                                \
-gnome_preferences_get_##c_name## (void)                 \
+gnome_preferences_get_ ## c_name (void)                 \
 {                                                       \
-    return desktop_property_get_boolean (##prop_name##);\
+    return desktop_property_get_boolean (prop_name);    \
 }                                                       \
 void                                                    \
-gnome_preferences_set_##c_name## (gboolean value)       \
+gnome_preferences_set_ ## c_name (gboolean value)       \
 {                                                       \
-    desktop_property_set_boolean (##prop_name##, value);\
+    desktop_property_set_boolean (prop_name, value);    \
 }
 
 /**
diff --git a/monikers/desktop-item-boot.c b/monikers/desktop-item-boot.c
index d7ce611..989036a 100644
--- a/monikers/desktop-item-boot.c
+++ b/monikers/desktop-item-boot.c
@@ -1,6 +1,7 @@
 /* -*- Mode: C; c-set-style: gnu indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 #include <libbonobo.h>
 #include <libgnome/Gnome.h>
+#include <stdlib.h>
 
 static void
 boot_ditem (Bonobo_ConfigDatabase db)
diff --git a/monikers/test-ditem.c b/monikers/test-ditem.c
index b181f19..68f14eb 100644
--- a/monikers/test-ditem.c
+++ b/monikers/test-ditem.c
@@ -3,6 +3,7 @@
 #include <libgnome/Gnome.h>
 #include <libgnome/gnome-ditem.h>
 #include <locale.h>
+#include <stdlib.h>
 
 #include "bonobo-config-ditem.h"