From 51dba6bd0c19773ba8b631efbf51c07d548fc75c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 1 Feb 2009 01:18:42 +0000 Subject: ** Disable debug macros (#define d(x) x) throughout. (#569638) 2009-01-31 Matthew Barnes ** Disable debug macros (#define d(x) x) throughout. (#569638) svn path=/trunk/; revision=37202 --- ChangeLog | 4 ++++ addressbook/gui/widgets/gal-view-minicard.c | 2 +- calendar/gui/alarm-notify/alarm-notify.c | 2 +- calendar/gui/alarm-notify/alarm-queue.c | 2 +- calendar/gui/gnome-cal.c | 2 +- calendar/gui/memos-component.c | 1 - mail/em-migrate.c | 2 +- mail/importers/elm-importer.c | 2 +- mail/importers/pine-importer.c | 2 +- plugins/backup-restore/backup.c | 2 +- plugins/email-custom-header/email-custom-header.c | 2 +- plugins/face/face.c | 2 +- widgets/misc/e-unicode.c | 2 +- 13 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef69d990d7..ff9a9f59ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-01-31 Matthew Barnes + + ** Disable debug macros (#define d(x) x) throughout. (#569638) + 2009-01-29 Tor Lillqvist Cross-compilation from Linux to Windows support by Fridrich Strba. diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index 02276a6960..4645517bfc 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -34,7 +34,7 @@ #include "gal-view-minicard.h" #define PARENT_TYPE gal_view_get_type () -#define d(x) x +#define d(x) static GalViewClass *gal_view_minicard_parent_class; diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index fb29f7f7d8..7afa854426 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -46,7 +46,7 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; -#define d(x) x +#define d(x) static void alarm_notify_class_init (AlarmNotifyClass *klass); diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index cc11455fc6..af99eb8c6d 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -57,7 +57,7 @@ -#define d(x) x +#define d(x) /* The dialog with alarm nofications */ static AlarmNotificationsDialog *alarm_notifications_dialog = NULL; diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 560c55dd2a..3a539cb1b2 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -88,7 +88,7 @@ #define G_MAXINT32 ((gint32) 0x7fffffff) #endif -#define d(x) x +#define d(x) /* hash table define for non intrusive error dialog */ static GHashTable *non_intrusive_error_table = NULL; diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 82961c0ded..3fbebd7e3e 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -118,7 +118,6 @@ struct _MemosComponentPrivate { GList *notifications; }; -/* #define d(x) x */ #define d(x) static void diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 73bb319eb8..c2c63582ea 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -73,7 +73,7 @@ #include "em-utils.h" #include "em-migrate.h" -#define d(x) x +#define d(x) #ifndef G_OS_WIN32 /* No versions previous to 2.8 or thereabouts have been available on diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index de26d7c0c1..156c8d08cb 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -46,7 +46,7 @@ #include "e-util/e-import.h" #include "e-util/e-error.h" -#define d(x) x +#define d(x) struct _elm_import_msg { MailMsg base; diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 1036724ad8..e040a4060e 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -49,7 +49,7 @@ #include "e-util/e-import.h" #include "e-util/e-error.h" -#define d(x) x +#define d(x) struct _pine_import_msg { MailMsg base; diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index f7a42114aa..ac0b257d17 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -76,7 +76,7 @@ static const GOptionEntry options[] = { { NULL } }; -#define d(x) x +#define d(x) #define rc(x) G_STMT_START { g_message (x); system (x); } G_STMT_END diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 5942d28c20..0305dd2c25 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -39,7 +39,7 @@ #include "email-custom-header.h" -#define d(x) x +#define d(x) #define GCONF_KEY_CUSTOM_HEADER "/apps/evolution/eplugin/email_custom_header/customHeader" typedef struct { diff --git a/plugins/face/face.c b/plugins/face/face.c index eff4fa5794..ba683e91aa 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -32,7 +32,7 @@ #include #include -#define d(x) x +#define d(x) gboolean e_plugin_ui_init (GtkUIManager *manager, EMsgComposer *composer); diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c index a98154dd20..9d660b6600 100644 --- a/widgets/misc/e-unicode.c +++ b/widgets/misc/e-unicode.c @@ -46,7 +46,7 @@ #include #include "e-unicode.h" -#define d(x) x +#define d(x) #define FONT_TESTING #define MAX_DECOMP 8 -- cgit