diff --git a/ChangeLog b/ChangeLog index ab6c69443..90d52daeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-17 Matthias Clasen + + * glib/gkeyfile.c: Define S_ISREG() on windows, since it + is not present there. (#158469, Kazuki IWAMOTO) + 2004-11-15 Matthias Clasen * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ab6c69443..90d52daeb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-11-17 Matthias Clasen + + * glib/gkeyfile.c: Define S_ISREG() on windows, since it + is not present there. (#158469, Kazuki IWAMOTO) + 2004-11-15 Matthias Clasen * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ab6c69443..90d52daeb 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2004-11-17 Matthias Clasen + + * glib/gkeyfile.c: Define S_ISREG() on windows, since it + is not present there. (#158469, Kazuki IWAMOTO) + 2004-11-15 Matthias Clasen * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ab6c69443..90d52daeb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-11-17 Matthias Clasen + + * glib/gkeyfile.c: Define S_ISREG() on windows, since it + is not present there. (#158469, Kazuki IWAMOTO) + 2004-11-15 Matthias Clasen * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ab6c69443..90d52daeb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-11-17 Matthias Clasen + + * glib/gkeyfile.c: Define S_ISREG() on windows, since it + is not present there. (#158469, Kazuki IWAMOTO) + 2004-11-15 Matthias Clasen * glib/gkeyfile.c (g_key_file_load_from_fd): Use S_ISREG(), since diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c index 397777f42..939589e5e 100644 --- a/glib/gkeyfile.c +++ b/glib/gkeyfile.c @@ -39,8 +39,13 @@ #endif #ifdef G_OS_WIN32 #include + +#ifndef S_ISREG +#define S_ISREG(mode) ((mode)&_S_IFREG) #endif +#endif /* G_OS_WIN23 */ + #include "gconvert.h" #include "gdataset.h" #include "gerror.h"