diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-03-20 23:51:35 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-03-20 23:51:35 +0000 |
| commit | 37892848074f79f91d71a16eed4d8dcef76a274e (patch) | |
| tree | 62828af097ededde544d20bb3b81097c4f7f53a5 /util | |
| parent | be9bec9bc77fdfe81cab9b6312ccdc4817e37938 (diff) | |
| download | openssl-new-37892848074f79f91d71a16eed4d8dcef76a274e.tar.gz | |
Sometimes, we have partial comments on the same line as other stuff we
parse. Make sure to read in the whole comment, so it can be entirely
removed.
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mkdef.pl | 4 | ||||
| -rw-r--r-- | util/pl/VC-16.pl | 2 | ||||
| -rw-r--r-- | util/pl/VC-CE.pl | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index 3091e2035b..dc5b12b904 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -448,6 +448,10 @@ sub do_defs } s/\/\*.*?\*\///gs; # ignore comments + if (/\/\*/) { # if we have part + $line = $_; # of a comment, + next; # continue reading + } s/{[^{}]*}//gs; # ignore {} blocks print STDERR "DEBUG: \$def=\"$def\"\n" if $debug && $def ne ""; print STDERR "DEBUG: \$_=\"$_\"\n" if $debug; diff --git a/util/pl/VC-16.pl b/util/pl/VC-16.pl index 7cda5e67a9..ab97c4c9b8 100644 --- a/util/pl/VC-16.pl +++ b/util/pl/VC-16.pl @@ -44,7 +44,7 @@ if ($win16) else { $no_sock=1; - $cflags.=" -DMSDOS"; + $cflags.=" -DOPENSSL_SYSNAME_MSDOS"; $lflags.=" /EXEPACK"; $ex_libs.="oldnames.lib llibce.lib"; } diff --git a/util/pl/VC-CE.pl b/util/pl/VC-CE.pl index 1805ef9d97..3267cd4893 100644 --- a/util/pl/VC-CE.pl +++ b/util/pl/VC-CE.pl @@ -12,7 +12,7 @@ $rm='del'; # C compiler stuff $cc='$(CC)'; -$cflags=' /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo $(WCETARGETDEFS) -DUNICODE -D_UNICODE -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include'; +$cflags=' /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo $(WCETARGETDEFS) -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include'; $lflags='/nologo /subsystem:windowsce,$(WCELDVERSION) /machine:$(WCELDMACHINE) /opt:ref'; $mlflags=''; @@ -22,7 +22,7 @@ $inc_def="inc32"; if ($debug) { - $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32"; + $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DOPENSSL_SYSNAME_WINCE -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32"; $lflags.=" /debug"; $mlflags.=' /debug'; } |