From d742d805d4c944d7affc90b56ff5e28753dcb10c Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 5 Jan 2005 11:15:04 +0000 Subject: [PATCH] gst/: Fix macro's for Mingw (fixes #162276). Original commit message from CVS: Reviewed by: Ronald S. Bultje * gst/gstregistry.h: * gst/registries/gstxmlregistry.c: Fix macro's for Mingw (fixes #162276). --- ChangeLog | 15 ++++++++++++--- gst/gstregistry.h | 9 +++++++++ gst/registries/gstxmlregistry.c | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 064e9a1c4e..9eb990b08d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,22 @@ +2005-01-05 Vincent Torri + + Reviewed by: Ronald S. Bultje + + * gst/gstregistry.h: + * gst/registries/gstxmlregistry.c: + Fix macro's for Mingw (fixes #162276). + 2005-01-04 Stefan Kost * 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 diff --git a/gst/gstregistry.h b/gst/gstregistry.h index e1ac8ee4c6..f4676df63a 100644 --- 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 396ea1359e..365bceb412 100644 --- 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)