diff --git a/src/commands.c b/src/commands.c index 4e7d66c..53efc69 100644 --- a/src/commands.c +++ b/src/commands.c @@ -67,7 +67,7 @@ static int read_key(void) char key; int ret = 0; -#if defined HAVE_TERMIOS_H && !defined WIN32 +#if defined(HAVE_TERMIOS_H) && !defined(_WIN32) #ifdef __CYGWIN__ if (stdin_ready_for_reading()) #endif diff --git a/src/main.c b/src/main.c index 6320699..8376e73 100644 --- a/src/main.c +++ b/src/main.c @@ -245,7 +245,7 @@ int main(int argc, char **argv) int val, lf_flag; int flags; int played; -#ifndef WIN32 +#ifndef _WIN32 struct timeval tv; struct timezone tz; diff --git a/src/read_config.c b/src/read_config.c index 1c0d2ee..6e38c76 100644 --- a/src/read_config.c +++ b/src/read_config.c @@ -59,7 +59,7 @@ int read_config(struct options *o) if ((rc = fopen(myrc, "r")) == NULL) return -1; -#elif defined WIN32 +#elif defined _WIN32 const char *home = getenv("USERPROFILE"); if (!home) home = "C:"; @@ -291,7 +291,7 @@ void read_modconf(struct options *o, unsigned char *md5) parse_modconf(o, myrc, md5); #elif defined __AMIGA__ parse_modconf(o, "PROGDIR:modules.conf", md5); -#elif defined WIN32 +#elif defined _WIN32 char myrc[PATH_MAX]; const char *home = getenv("USERPROFILE"); if (!home) home = "C:"; diff --git a/src/win32/usleep.c b/src/win32/usleep.c index 0f81774..3c24a9d 100644 --- a/src/win32/usleep.c +++ b/src/win32/usleep.c @@ -19,7 +19,7 @@ void usleep(long usec) select(0, NULL, NULL, NULL, &tv); } -#elif defined WIN32 +#elif defined(_WIN32) /* usleep implementation from FreeSCI */