glib r6526 - in trunk: . glib gthread

[hans svn gnome org]

Author: hans
Date: Sun Feb 17 12:49:12 2008
New Revision: 6526
URL: http://svn.gnome.org/viewvc/glib?rev=6526&view=rev

Log:
2008-02-17  Hans Breuer  <hans breuer org>

	* glib/gutils.c : define CSIDL_MYPICTURES if not available
	* gthread/gthread-win32.c : use G_STRFUNC instead of compiler 
	specific __FUNCTION__



Modified:
   trunk/ChangeLog
   trunk/glib/gutils.c
   trunk/gthread/gthread-win32.c

Modified: trunk/glib/gutils.c
==============================================================================
--- trunk/glib/gutils.c	(original)
+++ trunk/glib/gutils.c	Sun Feb 17 12:49:12 2008
@@ -101,6 +101,9 @@
 #  ifndef CSIDL_COMMON_APPDATA
 #    define CSIDL_COMMON_APPDATA 35
 #  endif
+#  ifndef CSIDL_MYPICTURES
+#    define CSIDL_MYPICTURES 0x27
+#  endif
 #  ifndef CSIDL_COMMON_DOCUMENTS
 #    define CSIDL_COMMON_DOCUMENTS 46
 #  endif

Modified: trunk/gthread/gthread-win32.c
==============================================================================
--- trunk/gthread/gthread-win32.c	(original)
+++ trunk/gthread/gthread-win32.c	Sun Feb 17 12:49:12 2008
@@ -48,7 +48,7 @@
 #define win32_check_for_error(what) G_STMT_START{			\
   if (!(what))								\
     g_error ("file %s: line %d (%s): error %s during %s",		\
-	     __FILE__, __LINE__, __FUNCTION__,				\
+	     __FILE__, __LINE__, G_STRFUNC,				\
 	     g_win32_error_message (GetLastError ()), #what);		\
   }G_STMT_END