pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16965] trunk/libgaim/internal.h

[<the...@us...>]

Revision: 16965
Author:   thekingant
Date:     2006-08-21 15:56:08 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16965&view=rev

Log Message:
-----------
Change the placeholder variable from x to String to
match the other #defines.  This is purely a cosmetic
change

Modified Paths:
--------------
    trunk/libgaim/internal.h
Modified: trunk/libgaim/internal.h
===================================================================
--- trunk/libgaim/internal.h	2006-08-21 22:55:08 UTC (rev 16964)
+++ trunk/libgaim/internal.h	2006-08-21 22:56:08 UTC (rev 16965)
@@ -43,7 +43,7 @@
 #ifdef ENABLE_NLS
 #  include <locale.h>
 #  include <libintl.h>
-#  define _(x) ((const char *)gettext(x))
+#  define _(String) ((const char *)gettext(String))
 #  ifdef gettext_noop
 #    define N_(String) gettext_noop (String)
 #  else
@@ -53,7 +53,7 @@
 #  include <locale.h>
 #  define N_(String) (String)
 #  ifndef _
-#    define _(x) ((const char *)x)
+#    define _(String) ((const char *)String)
 #  endif
 #  define ngettext(Singular, Plural, Number) ((Number == 1) ? ((const char *)Singular) : ((const char *)Plural))
 #endif


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

[Gaim-commits] SF.net SVN: gaim: [17391] trunk/libgaim/internal.h

[<the...@us...>]

Revision: 17391
          http://svn.sourceforge.net/gaim/?rev=17391&view=rev
Author:   thekingant
Date:     2006-09-28 01:33:58 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
G_MAXUINT32 is used in libgaim/protocols/oscar/oft.c, but it is only defined
in glib 2.4 and higher

Modified Paths:
--------------
    trunk/libgaim/internal.h

Modified: trunk/libgaim/internal.h
===================================================================
--- trunk/libgaim/internal.h	2006-09-28 07:05:33 UTC (rev 17390)
+++ trunk/libgaim/internal.h	2006-09-28 08:33:58 UTC (rev 17391)
@@ -121,6 +121,10 @@
 #define PATHSIZE 1024
 
 #include <glib.h>
+#if !GLIB_CHECK_VERSION(2,4,0)
+#	define G_MAXUINT32 ((guint32) 0xffffffff)
+#endif
+
 #if GLIB_CHECK_VERSION(2,6,0)
 #	include <glib/gstdio.h>
 #endif


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