define CSIDL_MYPICTURES if not available use G_STRFUNC instead of compiler

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__

svn path=/trunk/; revision=6526

diff --git a/ChangeLog b/ChangeLog
index 77de7c9..7104074 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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__
+
 2008-02-13  Ryan Lortie  <desrt@desrt.ca>
 
        * docs/reference/gio/gio-sections.txt: add

diff --git a/glib/gutils.c b/glib/gutils.c
index cc57e8f..c6a66b1 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -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

diff --git a/gthread/gthread-win32.c b/gthread/gthread-win32.c
index f566e28..465b205 100644 (file)
--- a/gthread/gthread-win32.c
+++ b/gthread/gthread-win32.c
@@ -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