# HG changeset patch # User Richard Laager # Date 1153790704 0 # Node ID 0567de1166991f823238fc6c70ee31d23ec0015d # Parent 87797e287549d7602064ab816b4621325e773b83 [gaim-migrate @ 16566] Having value.h include config.h is bad. It caused plenty of warnings building my plugins, for example. committer: Tailor Script diff -r 87797e287549 -r 0567de116699 src/gtkconv.c --- 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, diff -r 87797e287549 -r 0567de116699 src/log.c --- 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); diff -r 87797e287549 -r 0567de116699 src/value.h --- 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 -#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.