aboutsummaryrefslogtreecommitdiffstats
path: root/asn1c
diff options
context:
space:
mode:
authorLev Walkin <vlm@lionet.info>2010-11-20 09:47:13 -0800
committerLev Walkin <vlm@lionet.info>2010-11-20 09:47:13 -0800
commit936595643a2a71f6ef3e50cb7c71734e30b20b2f (patch)
treeee1cf23b7ea1bda9118d877dfa125f6227310846 /asn1c
parent464166ca446b5cc46037bbadfa069743a4e18498 (diff)
WIN32 -> _WIN32; see http://predef.sourceforge.net/preos.html#sec25
Diffstat (limited to 'asn1c')
-rw-r--r--asn1c/asn1c.c10
-rw-r--r--asn1c/sys-common.h6
-rw-r--r--asn1c/webcgi/asn1c-suid-helper.c2
3 files changed, 9 insertions, 9 deletions
diff --git a/asn1c/asn1c.c b/asn1c/asn1c.c
index 08a3690c..4c565e4a 100644
--- a/asn1c/asn1c.c
+++ b/asn1c/asn1c.c
@@ -42,7 +42,7 @@
#include <asn1c_compat.h> /* Portable basename(3) and dirname(3) */
-#ifdef WIN32
+#ifdef _WIN32
#include <io.h>
#include <direct.h>
#else
@@ -345,7 +345,7 @@ importStandardModules(asn1p_t *asn, const char *skeletons_dir) {
char *target_dir;
int target_dir_len;
int len;
-#ifdef WIN32
+#ifdef _WIN32
intptr_t dir;
struct _finddata_t c_file;
char *pattern;
@@ -369,7 +369,7 @@ importStandardModules(asn1p_t *asn, const char *skeletons_dir) {
snprintf(target_dir, target_dir_len + 1, "%s/standard-modules",
skeletons_dir);
-#ifdef WIN32
+#ifdef _WIN32
len = target_dir_len + sizeof("/*.asn1");
pattern = malloc(len);
assert(pattern);
@@ -386,7 +386,7 @@ importStandardModules(asn1p_t *asn, const char *skeletons_dir) {
return -1;
}
-#ifdef WIN32
+#ifdef _WIN32
do {
filename = c_file.name;
#else
@@ -416,7 +416,7 @@ importStandardModules(asn1p_t *asn, const char *skeletons_dir) {
}
asn1p_delete(new_asn);
-#ifdef WIN32
+#ifdef _WIN32
} while(_findnext(dir, &c_file) == 0);
_findclose(dir);
#else
diff --git a/asn1c/sys-common.h b/asn1c/sys-common.h
index 514a20cd..cac71c01 100644
--- a/asn1c/sys-common.h
+++ b/asn1c/sys-common.h
@@ -46,9 +46,9 @@
#include <sys/stat.h> /* for stat(2) */
#endif
-#ifndef WIN32
+#ifndef _WIN32
#include <sysexits.h> /* for EX_USAGE & others */
-#else /* WIN32 */
+#else /* _WIN32 */
#ifndef EX_USAGE
#define EX_USAGE 64
#endif
@@ -66,5 +66,5 @@
#endif
#define alloca _alloca
#define snprintf _snprintf
-#endif /* WIN32 */
+#endif /* _WIN32 */
diff --git a/asn1c/webcgi/asn1c-suid-helper.c b/asn1c/webcgi/asn1c-suid-helper.c
index a334f1f2..d987c7a2 100644
--- a/asn1c/webcgi/asn1c-suid-helper.c
+++ b/asn1c/webcgi/asn1c-suid-helper.c
@@ -6,7 +6,7 @@
#include <errno.h>
#include <sysexits.h>
-#ifdef WIN32
+#ifdef _WIN32
#define setuid(s)
#define getuid()
#define setgid(s)