cvs: /php4/regex engine.c regcomp.c /php4/sapi/isapi php4isapi.dsp

andi Sun Nov 14 15:13:55 1999 EDT Modified files: /php4/regex engine.c regcomp.c /php4/sapi/isapi php4isapi.dsp Log: - Fixing warnings in regex Index: php4/regex/engine.c diff -u php4/regex/engine.c:1.2 php4/regex/engine.c:1.3 --- php4/regex/engine.c:1.2 Fri Nov 12 15:27:52 1999 +++ php4/regex/engine.c Sun Nov 14 15:13:53 1999 @@ -71,7 +71,7 @@ int eflags; { register char *endp; - register int i; + register size_t i; struct match mv; register struct match *m = &mv; register char *dp; Index: php4/regex/regcomp.c diff -u php4/regex/regcomp.c:1.3 php4/regex/regcomp.c:1.4 --- php4/regex/regcomp.c:1.3 Fri Nov 12 15:27:52 1999 +++ php4/regex/regcomp.c Sun Nov 14 15:13:53 1999 @@ -1056,7 +1056,7 @@ register struct parse *p; register cset *cs; { - register int i; + register size_t i; register cset *top = &p->g->sets[p->g->ncsets]; register size_t css = (size_t)p->g->csetsize; @@ -1082,7 +1082,7 @@ register cset *cs; { register uch h = cs->hash; - register int i; + register size_t i; register cset *top = &p->g->sets[p->g->ncsets]; register cset *cs2; register size_t css = (size_t)p->g->csetsize; @@ -1115,7 +1115,7 @@ register struct parse *p; register cset *cs; { - register int i; + register size_t i; register size_t css = (size_t)p->g->csetsize; for (i = 0; i < css; i++) @@ -1134,7 +1134,7 @@ register struct parse *p; register cset *cs; { - register int i; + register size_t i; register size_t css = (size_t)p->g->csetsize; register int n = 0; Index: php4/sapi/isapi/php4isapi.dsp diff -u php4/sapi/isapi/php4isapi.dsp:1.1 php4/sapi/isapi/php4isapi.dsp:1.2 --- php4/sapi/isapi/php4isapi.dsp:1.1 Mon Sep 27 12:34:28 1999 +++ php4/sapi/isapi/php4isapi.dsp Sun Nov 14 15:13:54 1999 @@ -42,7 +42,7 @@ # PROP Intermediate_Dir "Debug_TS" # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\win32" /I "..\libzend" /I ".." /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "COMPILE_LIBZEND" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\win32" /I "..\..\libzend" /I "..\.." /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "COMPILE_LIBZEND" /D "WIN32" /D "_MBCS" /D "ZTS" /D ZEND_DEBUG=1 /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -52,7 +52,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\Debug_TS" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\..\Debug_TS" !ELSEIF "$(CFG)" == "php4isapi - Win32 Release_TS" @@ -68,7 +68,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\win32" /I "..\libzend" /I ".." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I "..\..\libzend" /I "..\.." /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -78,7 +78,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /libpath:"..\Release_TS" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" !ENDIF