r15097 - gnucash/trunk/src - Replace remaining _WIN32 macro tests by G_OS_WIN32 ones.

[Andreas Köhler]

Author: andi5
Date: 2006-11-08 16:06:59 -0500 (Wed, 08 Nov 2006)
New Revision: 15097
Trac: http://svn.gnucash.org/trac/changeset/15097

Modified:
   gnucash/trunk/src/backend/file/gnc-backend-file.c
   gnucash/trunk/src/backend/file/io-gncxml-v2.c
   gnucash/trunk/src/gnome-utils/druid-gconf-setup.c
Log:
Replace remaining _WIN32 macro tests by G_OS_WIN32 ones.


Modified: gnucash/trunk/src/backend/file/gnc-backend-file.c
===================================================================
--- gnucash/trunk/src/backend/file/gnc-backend-file.c	2006-11-08 20:50:45 UTC (rev 15096)
+++ gnucash/trunk/src/backend/file/gnc-backend-file.c	2006-11-08 21:06:59 UTC (rev 15097)
@@ -83,7 +83,7 @@
 gnc_file_be_get_file_lock (FileBackend *be)
 {
     struct stat statbuf;
-#ifndef _WIN32
+#ifndef G_OS_WIN32
     char pathbuf[PATH_MAX];
     char *path = NULL;
 #endif
@@ -132,7 +132,7 @@
      * provides a better long-term solution.
      */
 
-#ifndef _WIN32
+#ifndef G_OS_WIN32
     strcpy (pathbuf, be->lockfile);
     path = strrchr (pathbuf, '.');
     sprintf (path, ".%lx.%d.LNK", gethostid(), getpid());
@@ -183,12 +183,12 @@
 
     return TRUE;
 
-#else /* ifndef _WIN32 */
+#else /* ifndef G_OS_WIN32 */
     /* On windows, there is no NFS and the open(,O_CREAT | O_EXCL)
        is sufficient for locking. */
     be->linkfile = NULL;
     return TRUE;
-#endif /* ifndef _WIN32 */
+#endif /* ifndef G_OS_WIN32 */
 }
 
 /* ================================================================= */

Modified: gnucash/trunk/src/backend/file/io-gncxml-v2.c
===================================================================
--- gnucash/trunk/src/backend/file/io-gncxml-v2.c	2006-11-08 20:50:45 UTC (rev 15096)
+++ gnucash/trunk/src/backend/file/io-gncxml-v2.c	2006-11-08 21:06:59 UTC (rev 15097)
@@ -1239,7 +1239,7 @@
   if (!use_gzip)
     return fopen(filename, perms);
 
-#ifdef _WIN32
+#ifdef G_OS_WIN32
   PWARN("Compression not implemented on Windows. Opening uncompressed file.");
   return fopen(filename, perms);
 

Modified: gnucash/trunk/src/gnome-utils/druid-gconf-setup.c
===================================================================
--- gnucash/trunk/src/gnome-utils/druid-gconf-setup.c	2006-11-08 20:50:45 UTC (rev 15096)
+++ gnucash/trunk/src/gnome-utils/druid-gconf-setup.c	2006-11-08 21:06:59 UTC (rev 15097)
@@ -614,7 +614,7 @@
     return;
   }
 
-#ifdef _WIN32
+#ifdef G_OS_WIN32
   {
     /* automatically update the search path on windows */
     GError *error = NULL;
@@ -631,7 +631,7 @@
       return;
     }
   }
-#endif /* _WIN32 */
+#endif /* G_OS_WIN32 */
 
   xml = gnc_glade_xml_new ("druid-gconf-setup.glade", "GConf Query");
   dialog = glade_xml_get_widget (xml, "GConf Query");