[Gaim-commits] SF.net SVN: gaim: [16566] trunk/src

[<rl...@us...>]

Revision: 16566
Author:   rlaager
Date:     2006-07-24 18:25:04 -0700 (Mon, 24 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16566&view=rev

Log Message:
-----------
Having value.h include config.h is bad.  It caused plenty of warnings building my plugins, for example.

Modified Paths:
--------------
    trunk/src/gtkconv.c
    trunk/src/log.c
    trunk/src/value.h
Modified: trunk/src/gtkconv.c
===================================================================
--- trunk/src/gtkconv.c	2006-07-24 23:57:11 UTC (rev 16565)
+++ trunk/src/gtkconv.c	2006-07-25 01:25:04 UTC (rev 16566)
@@ -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,

Modified: trunk/src/log.c
===================================================================
--- trunk/src/log.c	2006-07-24 23:57:11 UTC (rev 16565)
+++ trunk/src/log.c	2006-07-25 01:25:04 UTC (rev 16566)
@@ -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);

Modified: trunk/src/value.h
===================================================================
--- trunk/src/value.h	2006-07-24 23:57:11 UTC (rev 16565)
+++ trunk/src/value.h	2006-07-25 01:25:04 UTC (rev 16566)
@@ -26,7 +26,6 @@
 #define _GAIM_VALUE_H_
 
 #include <glib.h>
-#include "config.h"
 
 /**
  * Specific value types.
@@ -54,16 +53,7 @@
 
 } 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.
  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.