tracker r2258 - in branches/indexer-split: . src/tracker-extract src/tracker-indexer src/tracker-thumbnailer src/trackerd

[mr svn gnome org]

Author: mr
Date: Sun Sep 21 13:09:41 2008
New Revision: 2258
URL: http://svn.gnome.org/viewvc/tracker?rev=2258&view=rev

Log:
	* src/tracker-extract/tracker-extract-mp3.c: 
	* src/tracker-extract/tracker-extract.c:
	* src/tracker-indexer/tracker-main.c:
	* src/tracker-indexer/tracker-metadata-utils.c:
	* src/tracker-thumbnailer/tracker-thumbnailer.c:
	* src/trackerd/tracker-main.c: Use G_OS_WIN32 instead of OS_WIN32.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c
   branches/indexer-split/src/tracker-extract/tracker-extract.c
   branches/indexer-split/src/tracker-indexer/tracker-main.c
   branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c
   branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c
   branches/indexer-split/src/trackerd/tracker-main.c

Modified: branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c	(original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract-mp3.c	Sun Sep 21 13:09:41 2008
@@ -25,20 +25,21 @@
 #define _GNU_SOURCE
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifndef OS_WIN32
-#include <sys/mman.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
 
+#ifndef G_OS_WIN32
+#include <sys/mman.h>
+#endif
+
 #include "tracker-extract.h"
 
 #define MAX_FILE_READ	  1024 * 1024 * 10
@@ -1009,7 +1010,7 @@
 		size =	MAX_FILE_READ;
 	}
 
-#ifndef OS_WIN32
+#ifndef G_OS_WIN32
 	buffer = mmap (NULL, size, PROT_READ, MAP_PRIVATE, file, 0);
 #endif
 
@@ -1097,7 +1098,7 @@
 				     g_strdup ("tracker:unknown"));
 	}
 
-#ifndef OS_WIN32
+#ifndef G_OS_WIN32
 	munmap (buffer, size);
 #endif
 	close(file);

Modified: branches/indexer-split/src/tracker-extract/tracker-extract.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract.c	(original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract.c	Sun Sep 21 13:09:41 2008
@@ -30,17 +30,16 @@
 #include <errno.h>
 #include <locale.h>
 #include <sys/types.h>
-
-#ifndef OS_WIN32
-#include <sys/resource.h>
-#endif
-
 #include <sys/time.h>
 #include <unistd.h>
 
 #include <glib.h>
 #include <gmodule.h>
 
+#ifndef G_OS_WIN32
+#include <sys/resource.h>
+#endif
+
 #include <libtracker-common/tracker-os-dependant.h>
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>

Modified: branches/indexer-split/src/tracker-indexer/tracker-main.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-main.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-main.c	Sun Sep 21 13:09:41 2008
@@ -27,8 +27,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <glib/gi18n.h>
+#include <glib.h>
 #include <glib-object.h>
+#include <glib/gi18n.h>
 
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-ioprio.h>
@@ -164,7 +165,7 @@
 static void
 initialize_signal_handler (void)
 {
-#ifndef OS_WIN32
+#ifndef G_OS_WIN32
 	struct sigaction act, ign_act;
 	sigset_t	 empty_mask;
 

Modified: branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c	Sun Sep 21 13:09:41 2008
@@ -724,7 +724,7 @@
 	gchar **argv;
 	GString *text;
 
-#ifdef OS_WIN32
+#ifdef G_OS_WIN32
 	str = g_strconcat (mime, "_filter.bat", NULL);
 #else
 	str = g_strconcat (mime, "_filter", NULL);

Modified: branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c
==============================================================================
--- branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c	(original)
+++ branches/indexer-split/src/tracker-thumbnailer/tracker-thumbnailer.c	Sun Sep 21 13:09:41 2008
@@ -26,11 +26,12 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/param.h>
+#include <png.h>
+
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <png.h>
 
-#ifdef OS_WIN32
+#ifdef G_OS_WIN32
 #include <Windows.h>
 
 #define _fullpath_internal(res,path,size) \

Modified: branches/indexer-split/src/trackerd/tracker-main.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-main.c	Sun Sep 21 13:09:41 2008
@@ -34,9 +34,9 @@
 #include <errno.h>
 #include <time.h>
 
-#include <glib/gstdio.h>
+#include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gpattern.h>
+#include <glib/gstdio.h>
 
 #include <libtracker-common/tracker-config.h>
 #include <libtracker-common/tracker-file-utils.h>
@@ -61,7 +61,7 @@
 #include "tracker-status.h"
 #include "tracker-xesam-manager.h"
 
-#ifdef OS_WIN32
+#ifdef G_OS_WIN32
 #include <windows.h>
 #include <pthread.h>
 #include "mingw-compat.h"
@@ -385,7 +385,7 @@
 static void
 initialize_signal_handler (void)
 {
-#ifndef OS_WIN32
+#ifndef G_OS_WIN32
 	struct sigaction   act;
 	sigset_t	   empty_mask;
 
@@ -403,7 +403,7 @@
 	sigaction (SIGABRT, &act, NULL);
 	sigaction (SIGUSR1, &act, NULL);
 	sigaction (SIGINT,  &act, NULL);
-#endif
+#endif /* G_OS_WIN32 */
 }
 
 static void