eel r2056 - in trunk: . eel

[chpe svn gnome org]

Author: chpe
Date: Wed Feb 13 14:59:08 2008
New Revision: 2056
URL: http://svn.gnome.org/viewvc/eel?rev=2056&view=rev

Log:
2008-02-13  Christian Persch  <chpe gnome org>

	* configure.in:
	* eel/eel-string.c: (eel_strdup_vprintf_with_custom): Use G_VA_COPY.
	Bug #516232.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/eel/eel-string.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Feb 13 14:59:08 2008
@@ -119,23 +119,6 @@
 
 dnl ===========================================================================
 
-dnl va_copy checks
-
-AC_MSG_CHECKING([how to copy va_list])
-AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);],
-	AC_MSG_RESULT([va_copy]),
-	[ AH_TEMPLATE([va_copy], [define if va_copy is not available])
-	AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; __va_copy(ap1, ap2);],
-		[ AC_DEFINE([va_copy], [__va_copy])
-		AC_MSG_RESULT([__va_copy])],
-		[ AC_DEFINE([va_copy(dest,src)], [memcpy(&dest,&src,sizeof(va_list)) ])
-		AC_MSG_RESULT([memcpy])]
-		)
-	])
-
-
-dnl ===========================================================================
-
 dnl X development libraries check
 
 #

Modified: trunk/eel/eel-string.c
==============================================================================
--- trunk/eel/eel-string.c	(original)
+++ trunk/eel/eel-string.c	Wed Feb 13 14:59:08 2008
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <locale.h>
 #include <stdlib.h>
+#include <string.h>
 
 #if !defined (EEL_OMIT_SELF_CHECK)
 #include "eel-lib-self-check-functions.h"
@@ -745,7 +746,7 @@
 		if (conversions[i].precision_pos != -1) {
 			char *val;
 			
-			va_copy(va, va_orig);
+			G_VA_COPY(va, va_orig);
 			skip_to_arg (&va, args, custom, conversions[i].precision_pos);
 			val = g_strdup_vprintf ("%d", va);
 			va_end (va);
@@ -760,7 +761,7 @@
 		if (conversions[i].width_pos != -1) {
 			char *val;
 			
-			va_copy(va, va_orig);
+			G_VA_COPY(va, va_orig);
 			skip_to_arg (&va, args, custom, conversions[i].width_pos);
 			val = g_strdup_vprintf ("%d", va);
 			va_end (va);
@@ -772,7 +773,7 @@
 			g_free (val);
 		}
 		
-		va_copy(va, va_orig);
+		G_VA_COPY(va, va_orig);
 		skip_to_arg (&va, args, custom, conversions[i].arg_pos);
 		type = args[conversions[i].arg_pos];
 		if (type < 0) {