Skip to content
Browse files

change from MINGW to WIN32

  • Loading branch information...
1 parent d4d9e4e commit 78f227be9c454a893546b1c42470a2c40122c5ee @honglei honglei committed with jech Jan 28, 2010
Showing with 10 additions and 8 deletions.
  1. +1 −1 chunk.c
  2. +1 −1 fts_compat.c
  3. +1 −1 io.c
  4. +1 −1 mingw.c
  5. +1 −1 mingw.h
  6. +4 −2 polipo.h
  7. +1 −1 util.c
View
2 chunk.c
@@ -184,7 +184,7 @@ totalChunkArenaSize()
}
#else
-#ifdef MINGW
+#ifdef WIN32 /*MINGW*/
#define MAP_FAILED NULL
#define getpagesize() (64 * 1024)
static void *
View
2 fts_compat.c
@@ -127,7 +127,7 @@ dirfd(DIR *dir)
/*
* Make the directory identified by the argument the current directory.
*/
-#ifdef MINGW
+#ifdef WIN32 /*MINGW*/
int
change_to_dir(DIR *dir)
{
View
2 io.c
@@ -799,7 +799,7 @@ create_listener(char *address, int port,
int
setNonblocking(int fd, int nonblocking)
{
-#ifdef MINGW
+#ifdef WIN32 /*MINGW*/
return mingw_setnonblocking(fd, nonblocking);
#else
int rc;
View
2 mingw.c
@@ -23,7 +23,7 @@ THE SOFTWARE.
#include "polipo.h"
-#ifndef MINGW
+#ifndef WIN32 /*MINGW*/
static int dummy ATTRIBUTE((unused));
View
2 mingw.h
@@ -32,7 +32,7 @@ THE SOFTWARE.
* symbol. For Unix or Unix-like systems, leave it undefined.
*/
-#ifdef MINGW
+#ifdef WIN32 /*MINGW*/
/* Unfortunately, there's no hiding it. */
#define HAVE_WINSOCK 1
View
6 polipo.h
@@ -24,7 +24,9 @@ THE SOFTWARE.
#define _GNU_SOURCE
#endif
+#ifndef WIN32
#include <sys/param.h>
+#endif
#ifdef __MINGW32_VERSION
#define MINGW
@@ -43,7 +45,7 @@ THE SOFTWARE.
#include <sys/time.h>
#include <sys/stat.h>
#include <dirent.h>
-#ifndef MINGW
+#ifndef WIN32 /*MINGW*/
#include <sys/mman.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -165,7 +167,7 @@ THE SOFTWARE.
#define UNALIGNED_ACCESS
#endif
-#ifndef MINGW
+#ifndef WIN32 /*MINGW*/
#define HAVE_FORK
#ifndef NO_SYSLOG
#define HAVE_SYSLOG
View
2 util.c
@@ -393,7 +393,7 @@ pstrerror(int e)
default: s = NULL; break;
}
if(!s) s = strerror(e);
-#ifdef MINGW
+#ifdef WIN32 /*MINGW*/
if(!s) {
if(e >= WSABASEERR && e <= WSABASEERR + 2000) {
/* This should be okay, as long as the caller discards the

0 comments on commit 78f227b

Please sign in to comment.
Something went wrong with that request. Please try again.