tracker r2465 - in trunk: . src/libtracker-common

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Thu Nov  6 10:37:21 2008
New Revision: 2465
URL: http://svn.gnome.org/viewvc/tracker?rev=2465&view=rev

Log:
2008-11-06  Philip Van Hoof  <philip codeminded be>
	Patch from Jerry Tan <Jerry Tan Sun COM>

	* src/libtracker-common/tracker-os-dependant-unix.c: stdin/stdout is 
	keyword for compile, replace it



Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-os-dependant-unix.c

Modified: trunk/src/libtracker-common/tracker-os-dependant-unix.c
==============================================================================
--- trunk/src/libtracker-common/tracker-os-dependant-unix.c	(original)
+++ trunk/src/libtracker-common/tracker-os-dependant-unix.c	Thu Nov  6 10:37:21 2008
@@ -87,7 +87,7 @@
 {
 	GError	 *error = NULL;
 	gboolean  result;
-	gint	  stdin, stdout, stderr;
+	gint	  tmpstdin, tmpstdout, tmpstderr;
 
 	g_return_val_if_fail (argv != NULL, FALSE);
 	g_return_val_if_fail (argv[0] != NULL, FALSE);
@@ -101,9 +101,9 @@
 					   tracker_spawn_child_func,
 					   GINT_TO_POINTER (timeout),
 					   pid,
-					   stdin_channel ? &stdin : NULL,
-					   stdout_channel ? &stdout : NULL,
-					   stderr_channel ? &stderr : NULL,
+					   stdin_channel ? &tmpstdin : NULL,
+					   stdout_channel ? &tmpstdout : NULL,
+					   stderr_channel ? &tmpstderr : NULL,
 					   &error);
 
 	if (error) {
@@ -114,15 +114,15 @@
 	}
 
 	if (stdin_channel) {
-		*stdin_channel = result ? g_io_channel_unix_new (stdin) : NULL;
+		*stdin_channel = result ? g_io_channel_unix_new (tmpstdin) : NULL;
 	}
 
 	if (stdout_channel) {
-		*stdout_channel = result ? g_io_channel_unix_new (stdout) : NULL;
+		*stdout_channel = result ? g_io_channel_unix_new (tmpstdout) : NULL;
 	}
 
 	if (stderr_channel) {
-		*stderr_channel = result ? g_io_channel_unix_new (stderr) : NULL;
+		*stderr_channel = result ? g_io_channel_unix_new (tmpstderr) : NULL;
 	}
 
 	return result;