Commit 37892848 authored by Richard Levitte's avatar Richard Levitte
Browse files

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.
parent be9bec9b

util/mkdef.pl

+4 −0
Original line number Diff line number Diff line
@@ -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;

util/pl/VC-16.pl

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ if ($win16) 
else

	{

	$no_sock=1;

	$cflags.=" -DMSDOS";

	$cflags.=" -DOPENSSL_SYSNAME_MSDOS";

	$lflags.=" /EXEPACK";

	$ex_libs.="oldnames.lib llibce.lib";

	}

util/pl/VC-CE.pl

+2 −2
Original line number Diff line number Diff line
@@ -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';

	}