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.

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 3091e2035b802c86da0e99289897269f3784d6c7..dc5b12b904e6667d5861aa72b1b36e876b9165b3 100755 (executable)
--- 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 7cda5e67a94093ff6085d05e8a681e59a49485b7..ab97c4c9b8320c1d2a7a617a9eb8a587610fdff6 100644 (file)
--- 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 1805ef9d976060bd6ec1622129321b3025b1bed2..3267cd4893036f5f52e8d729296f7567d97b3188 100644 (file)
--- 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';
        }