Mercurial > pidgin.yaz
changeset 13992:0567de116699
[gaim-migrate @ 16566]
Having value.h include config.h is bad. It caused plenty of warnings building my plugins, for example.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 25 Jul 2006 01:25:04 +0000 |
| parents | 87797e287549 |
| children | e6977f9435a1 |
| files | src/gtkconv.c src/log.c src/value.h |
| diffstat | 3 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Mon Jul 24 23:57:11 2006 +0000 +++ b/src/gtkconv.c Tue Jul 25 01:25:04 2006 +0000 @@ -6585,7 +6585,13 @@ gaim_value_new(GAIM_TYPE_POINTER), 2, gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_LOG), - gaim_value_new(GAIM_TYPE_TIME_T)); +#if SIZEOF_TIME_T == 4 + gaim_value_new(GAIM_TYPE_INT)); +#elif SIZE_OF_TIME_T == 8 + gaim_value_new(GAIM_TYPE_INT64)); +#else +# error Unknown size of time_t +#endif gaim_signal_register(handle, "displaying-im-msg", gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,
--- a/src/log.c Mon Jul 24 23:57:11 2006 +0000 +++ b/src/log.c Tue Jul 25 01:25:04 2006 +0000 @@ -604,7 +604,13 @@ gaim_value_new(GAIM_TYPE_POINTER), 2, gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_LOG), - gaim_value_new(GAIM_TYPE_TIME_T)); +#if SIZEOF_TIME_T == 4 + gaim_value_new(GAIM_TYPE_INT)); +#elif SIZE_OF_TIME_T == 8 + gaim_value_new(GAIM_TYPE_INT64)); +#else +# error Unknown size of time_t +#endif gaim_prefs_connect_callback(NULL, "/core/logging/format", logger_pref_cb, NULL);
--- a/src/value.h Mon Jul 24 23:57:11 2006 +0000 +++ b/src/value.h Tue Jul 25 01:25:04 2006 +0000 @@ -26,7 +26,6 @@ #define _GAIM_VALUE_H_ #include <glib.h> -#include "config.h" /** * Specific value types. @@ -54,15 +53,6 @@ } GaimType; -/* time_t is normally either an int or a uint; this is a little ugly - * and probably deserves revisiting. */ -#if SIZEOF_TIME_T == 8 -# define GAIM_TYPE_TIME_T GAIM_TYPE_INT64 -#else -# define GAIM_TYPE_TIME_T GAIM_TYPE_INT -#endif /* sizeof(time_t) == 8 */ - - /** * Gaim-specific subtype values.