Don't use S_ISREG macro (#156728, Kazuki IWAMOTO)

2004-10-28  Ray Strode  <rstrode@redhat.com>

	* glib/gkeyfile.c: Don't use S_ISREG macro (#156728,
	Kazuki IWAMOTO)

diff --git a/ChangeLog b/ChangeLog
index 3d8fe77..981f86f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-28  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gkeyfile.c: Don't use S_ISREG macro (#156728,
+       Kazuki IWAMOTO)
+
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gstdio.c: Include galias.h before glib.h (#156697,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3d8fe77..981f86f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-28  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gkeyfile.c: Don't use S_ISREG macro (#156728,
+       Kazuki IWAMOTO)
+
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gstdio.c: Include galias.h before glib.h (#156697,

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3d8fe77..981f86f 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-10-28  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gkeyfile.c: Don't use S_ISREG macro (#156728,
+       Kazuki IWAMOTO)
+
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gstdio.c: Include galias.h before glib.h (#156697,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3d8fe77..981f86f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-28  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gkeyfile.c: Don't use S_ISREG macro (#156728,
+       Kazuki IWAMOTO)
+
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gstdio.c: Include galias.h before glib.h (#156697,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3d8fe77..981f86f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-28  Ray Strode  <rstrode@redhat.com>
+
+       * glib/gkeyfile.c: Don't use S_ISREG macro (#156728,
+       Kazuki IWAMOTO)
+
 2004-10-28  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gstdio.c: Include galias.h before glib.h (#156697,

diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index cb34ea3..9f18511 100644 (file)
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -365,7 +365,7 @@ g_key_file_load_from_fd (GKeyFile       *key_file,
   gchar read_buf[4096];
 
   fstat (fd, &stat_buf);
-  if (!S_ISREG (stat_buf.st_mode))
+  if ((stat_buf.st_mode & S_IFMT) == S_IFREG)
     {
       g_set_error (error, G_KEY_FILE_ERROR,
                    G_KEY_FILE_ERROR_PARSE,