gst/: Fix macro's for Mingw (fixes #162276).

Original commit message from CVS:
Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
* gst/gstregistry.h:
* gst/registries/gstxmlregistry.c:
Fix macro's for Mingw (fixes #162276).

diff --git a/ChangeLog b/ChangeLog
index 064e9a1..9eb990b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,22 @@
+2005-01-05  Vincent Torri  <torri@iecn.u-nancy.fr>
+
+       Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * gst/gstregistry.h:
+       * gst/registries/gstxmlregistry.c:
+         Fix macro's for Mingw (fixes #162276).
+
 2005-01-04  Stefan Kost  <ensonic@users.sf.net>
 
        * docs/README:
-    quick shell oneliner to find undocumented members
+         quick shell oneliner to find undocumented members
        * docs/gst/tmpl/gstplugin.sgml:
        * docs/gst/tmpl/gstscheduler.sgml:
        * docs/gst/tmpl/gstthread.sgml:
-    more enumtypes cleanup
+         more enumtypes cleanup
        * gst/gsterror.h:
-    activated documentation comments, now someone needs to document the enums :(
+         activated documentation comments, now someone needs to document
+         the enums :(
 
 2005-01-03  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 

diff --git a/gst/gstregistry.h b/gst/gstregistry.h
index e1ac8ee..f4676df 100644 (file)
--- a/gst/gstregistry.h
+++ b/gst/gstregistry.h
@@ -36,14 +36,23 @@
 
 /* compatibility for pre-POSIX defines */
 #ifdef S_IRUSR
+#if defined(_WIN32) && defined(__MINGW32__)
+#define REGISTRY_DIR_PERMS (S_ISGID | \
+                            S_IRUSR | S_IWUSR | S_IXUSR)
+#else
 #define REGISTRY_DIR_PERMS (S_ISGID | \
                             S_IRUSR | S_IWUSR | S_IXUSR | \
                            S_IRGRP | S_IXGRP | \
                            S_IROTH | S_IXOTH)
+#endif
 #define REGISTRY_TMPFILE_PERMS (S_IRUSR | S_IWUSR)
+#if defined(_WIN32) && defined(__MINGW32__)
+#define REGISTRY_FILE_PERMS (S_IRUSR | S_IWUSR
+#else
 #define REGISTRY_FILE_PERMS (S_IRUSR | S_IWUSR | \
                              S_IRGRP | S_IWGRP | \
                             S_IROTH | S_IWOTH)
+#endif
 #else
 #define REGISTRY_DIR_PERMS (S_ISGID | \
                             S_IREAD | S_IWRITE | S_IEXEC)

diff --git a/gst/registries/gstxmlregistry.c b/gst/registries/gstxmlregistry.c
index 396ea13..365bceb 100644 (file)
--- a/gst/registries/gstxmlregistry.c
+++ b/gst/registries/gstxmlregistry.c
@@ -319,7 +319,7 @@ get_time (const char *path, gboolean * is_dir)
   return statbuf.st_ctime;
 }
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #define xmkdir(dirname) _mkdir (dirname)
 #else
 #define xmkdir(dirname) mkdir (dirname, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)