Commit 1799b91e authored by Manish Singh's avatar Manish Singh

s/G_HAVE_CYGWIN/G_WITH_CYGWIN/

-Yosh
parent 61e9a437
Wed Oct 6 14:24:46 PDT 1999 Manish Singh <yosh@gimp.org>
* libgimp/gimp.c
* app/module_db.c
* app/plug_in.c: s/G_HAVE_CYGWIN/G_WITH_CYGWIN/
1999-10-06 Tor Lillqvist <tml@iki.fi>
* plug-ins/common/gpb.c: Fix the file_gih_save RUN_WITH_LAST_VALS
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -453,7 +453,7 @@ valid_module_name (const char *filename)
len = strlen (basename);
#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN) && !defined(__EMX__)
#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) && !defined(__EMX__)
if (len < 3 + 1 + 3)
return FALSE;
......
......@@ -453,7 +453,7 @@ valid_module_name (const char *filename)
len = strlen (basename);
#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN) && !defined(__EMX__)
#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) && !defined(__EMX__)
if (len < 3 + 1 + 3)
return FALSE;
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -453,7 +453,7 @@ valid_module_name (const char *filename)
len = strlen (basename);
#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN) && !defined(__EMX__)
#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) && !defined(__EMX__)
if (len < 3 + 1 + 3)
return FALSE;
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}
#else
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
/* Use Win32 shared memory mechanisms for
* transfering tile data.
*/
......@@ -421,7 +421,7 @@ plug_in_kill (void)
GSList *tmp;
PlugIn *plug_in;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
CloseHandle (shm_handle);
#else
#ifdef HAVE_SHM_H
......@@ -829,7 +829,7 @@ plug_in_open (PlugIn *plug_in)
return 0;
}
#if defined(G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_WITH_CYGWIN) || defined(__EMX__)
/* Set to binary mode */
setmode(my_read[0], _O_BINARY);
setmode(my_write[0], _O_BINARY);
......@@ -889,7 +889,7 @@ plug_in_open (PlugIn *plug_in)
fcntl(my_read[0], F_SETFD, 1);
fcntl(my_write[1], F_SETFD, 1);
#endif
#if defined(G_OS_WIN32) || defined (G_HAVE_CYGWIN) || defined(__EMX__)
#if defined(G_OS_WIN32) || defined (G_WITH_CYGWIN) || defined(__EMX__)
plug_in->pid = _spawnv (_P_NOWAIT, plug_in->args[0], plug_in->args);
if (plug_in->pid == -1)
#else
......
......@@ -42,7 +42,7 @@
#include <unistd.h>
#endif
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
#define STRICT
#include <windows.h>
#include <process.h>
......@@ -52,7 +52,7 @@
#include <io.h>
#endif
#ifdef G_HAVE_CYGWIN
#ifdef G_WITH_CYGWIN
#define O_TEXT 0x0100 /* text file */
#define _O_TEXT 0x0100 /* text file */
#define O_BINARY 0x0200 /* binary file */
......@@ -183,7 +183,7 @@ static ProcRecord *last_plug_in = NULL;
static int shm_ID = -1;
static guchar *shm_addr = NULL;
#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
static HANDLE shm_handle;
#endif
......@@ -220,7 +220,7 @@ plug_in_init_shm (void)
#endif
}