diff options
author | Rich Salz <rsalz@openssl.org> | 2015-01-23 11:58:26 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-01-23 11:58:26 -0500 |
commit | 68b00c237298b2e7e382686ffd583847d57bbc0b (patch) | |
tree | f0728a99d3d978a6268e715564401ae68e65167b /util | |
parent | 9b05cbc33e7895ed033b1119e300782d9e0cf23c (diff) | |
download | openssl-68b00c237298b2e7e382686ffd583847d57bbc0b.tar.gz |
ifdef cleanup part 3: OPENSSL_SYSNAME
Rename OPENSSL_SYSNAME_xxx to OPENSSL_SYS_xxx
Remove MS_STATIC; it's a relic from platforms <32 bits.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'util')
-rw-r--r-- | util/pl/BC-32.pl | 2 | ||||
-rw-r--r-- | util/pl/VC-32.pl | 2 | ||||
-rw-r--r-- | util/pl/netware.pl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index ed28e65e66..b659227f97 100644 --- a/util/pl/BC-32.pl +++ b/util/pl/BC-32.pl @@ -18,7 +18,7 @@ $out_def="out32"; $tmp_def="tmp32"; $inc_def="inc32"; #enable max error messages, disable most common warnings -$cflags="-DWIN32_LEAN_AND_MEAN -q -w-ccc -w-rch -w-pia -w-aus -w-par -w-inl -c -tWC -tWM -DOPENSSL_SYSNAME_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp -D_strnicmp=strnicmp "; +$cflags="-DWIN32_LEAN_AND_MEAN -q -w-ccc -w-rch -w-pia -w-aus -w-par -w-inl -c -tWC -tWM -DOPENSSL_SYS_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp -D_strnicmp=strnicmp "; if ($debug) { $cflags.="-Od -y -v -vi- -D_DEBUG"; diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index f9749e4c78..309312c7d3 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -122,7 +122,7 @@ elsif ($FLAVOR =~ /CE/) } $cc=($ENV{CC} or "cl"); - $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT'; + $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYS_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT'; $base_cflags.=" $wcecdefs"; $base_cflags.=' -I$(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'})); $base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'})); diff --git a/util/pl/netware.pl b/util/pl/netware.pl index fe80a9bb89..4e6f876378 100644 --- a/util/pl/netware.pl +++ b/util/pl/netware.pl @@ -222,7 +222,7 @@ else } # common defines -$cflags.=" -DL_ENDIAN -DOPENSSL_SYSNAME_NETWARE -U_WIN32"; +$cflags.=" -DL_ENDIAN -DOPENSSL_SYS_NETWARE -U_WIN32"; # If LibC build add in NKS_LIBC define and set the entry/exit # routines - The default entry/exit routines are for CLib and don't exist |