diff options
author | Joshua Allen <axlecrusher@gmail.com> | 2017-03-15 19:26:46 -0400 |
---|---|---|
committer | Joshua Allen <axlecrusher@gmail.com> | 2017-03-15 19:26:46 -0400 |
commit | 1388d54117ff780b7fadd4fd682b6def569838fa (patch) | |
tree | 3737760c889eeaf0bd7305becc943d859ae65d96 /redist/os_generic.h | |
parent | 62cef8aec06638bd006eaef46700f491750fc108 (diff) | |
parent | 9bd0a0d949639b516d28091f57862ac5e59e65da (diff) | |
download | libsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.gz libsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.bz2 |
Merge branch 'master' of github.com:cnlohr/libsurvive
Conflicts:
src/survive_data.c
Diffstat (limited to 'redist/os_generic.h')
-rw-r--r-- | redist/os_generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/redist/os_generic.h b/redist/os_generic.h index 7ce22f2..aac425b 100644 --- a/redist/os_generic.h +++ b/redist/os_generic.h @@ -1,7 +1,7 @@ #ifndef _OS_GENERIC_H
#define _OS_GENERIC_H
-#ifdef WIN32
+#if defined( WIN32 ) || defined (WINDOWS)
#define USE_WINDOWS
#endif
|