From 521e741d56080c21aa8c00923a4a94b3a8baa854 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 17 Feb 2008 12:49:12 +0000 Subject: [PATCH] define CSIDL_MYPICTURES if not available use G_STRFUNC instead of compiler 2008-02-17 Hans Breuer * 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 --- ChangeLog | 6 ++++++ glib/gutils.c | 3 +++ gthread/gthread-win32.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 77de7c978..7104074f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-17 Hans Breuer + + * 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 * docs/reference/gio/gio-sections.txt: add diff --git a/glib/gutils.c b/glib/gutils.c index cc57e8f46..c6a66b11d 100644 --- 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 f566e2858..465b20550 100644 --- 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