richter 01/06/12 11:29:00
Modified: . Tag: Embperl2c Embperl.pm epmain.c epnames.h
Log:
fix some compiler problems for sun cc
Revision Changes Path
No revision
No revision
1.118.4.44 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.43
retrieving revision 1.118.4.44
diff -u -r1.118.4.43 -r1.118.4.44
--- Embperl.pm 2001/06/05 11:58:09 1.118.4.43
+++ Embperl.pm 2001/06/12 18:28:51 1.118.4.44
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.43 2001/06/05 11:58:09 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.44 2001/06/12 18:28:51 richter Exp $
#
###################################################################################
@@ -68,7 +68,7 @@
##ep2##
-$VERSION = '2.0b3_dev-7' ;
+$VERSION = '2.0b3_dev-8' ;
##/ep2##
##ep1##$VERSION = '1.3.2';
1.75.4.37 +110 -103 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.36
retrieving revision 1.75.4.37
diff -u -r1.75.4.36 -r1.75.4.37
--- epmain.c 2001/06/05 11:58:11 1.75.4.36
+++ epmain.c 2001/06/12 18:28:53 1.75.4.37
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.75.4.36 2001/06/05 11:58:11 richter Exp $
+# $Id: epmain.c,v 1.75.4.37 2001/06/12 18:28:53 richter Exp $
#
###################################################################################*/
@@ -334,52 +334,52 @@
INTMGshort (CurrNode, pCurrReq -> xCurrNode)
#endif
-OPTMGRD (optDisableVarCleanup , pCurrReq -> bOptions) ;
-OPTMG (optDisableEmbperlErrorPage, pCurrReq -> bOptions) ;
-OPTMG (optReturnError , pCurrReq -> bOptions) ;
-OPTMGRD (optSafeNamespace , pCurrReq -> bOptions) ;
-OPTMGRD (optOpcodeMask , pCurrReq -> bOptions) ;
-OPTMG (optRawInput , pCurrReq -> bOptions) ;
-OPTMG (optSendHttpHeader , pCurrReq -> bOptions) ;
-OPTMGRD (optDisableChdir , pCurrReq -> bOptions) ;
-OPTMG (optDisableHtmlScan , pCurrReq -> bOptions) ;
-OPTMGRD (optEarlyHttpHeader , pCurrReq -> bOptions) ;
-OPTMGRD (optDisableFormData , pCurrReq -> bOptions) ;
-OPTMG (optDisableInputScan , pCurrReq -> bOptions) ;
-OPTMG (optDisableTableScan , pCurrReq -> bOptions) ;
-OPTMG (optDisableMetaScan , pCurrReq -> bOptions) ;
-OPTMGRD (optAllFormData , pCurrReq -> bOptions) ;
-OPTMGRD (optRedirectStdout , pCurrReq -> bOptions) ;
-OPTMG (optUndefToEmptyValue , pCurrReq -> bOptions) ;
-OPTMG (optNoHiddenEmptyValue , pCurrReq -> bOptions) ;
-OPTMGRD (optAllowZeroFilesize , pCurrReq -> bOptions) ;
-OPTMGRD (optKeepSrcInMemory , pCurrReq -> bOptions) ;
-OPTMG (optKeepSpaces , pCurrReq -> bOptions) ;
-OPTMG (optOpenLogEarly , pCurrReq -> bOptions) ;
-OPTMG (optNoUncloseWarn , pCurrReq -> bOptions) ;
-
-
-OPTMG (dbgStd , pCurrReq -> bDebug) ;
-OPTMG (dbgMem , pCurrReq -> bDebug) ;
-OPTMG (dbgEval , pCurrReq -> bDebug) ;
-OPTMG (dbgCmd , pCurrReq -> bDebug) ;
-OPTMG (dbgEnv , pCurrReq -> bDebug) ;
-OPTMG (dbgForm , pCurrReq -> bDebug) ;
-OPTMG (dbgTab , pCurrReq -> bDebug) ;
-OPTMG (dbgInput , pCurrReq -> bDebug) ;
-OPTMG (dbgFlushOutput , pCurrReq -> bDebug) ;
-OPTMG (dbgFlushLog , pCurrReq -> bDebug) ;
-OPTMG (dbgAllCmds , pCurrReq -> bDebug) ;
-OPTMG (dbgSource , pCurrReq -> bDebug) ;
-OPTMG (dbgFunc , pCurrReq -> bDebug) ;
-OPTMG (dbgLogLink , pCurrReq -> bDebug) ;
-OPTMG (dbgDefEval , pCurrReq -> bDebug) ;
-OPTMG (dbgWatchScalar , pCurrReq -> bDebug) ;
-OPTMG (dbgHeadersIn , pCurrReq -> bDebug) ;
-OPTMG (dbgShowCleanup , pCurrReq -> bDebug) ;
-OPTMG (dbgProfile , pCurrReq -> bDebug) ;
-OPTMG (dbgSession , pCurrReq -> bDebug) ;
-OPTMG (dbgImport , pCurrReq -> bDebug) ;
+OPTMGRD (optDisableVarCleanup , pCurrReq -> bOptions)
+OPTMG (optDisableEmbperlErrorPage, pCurrReq -> bOptions)
+OPTMG (optReturnError , pCurrReq -> bOptions)
+OPTMGRD (optSafeNamespace , pCurrReq -> bOptions)
+OPTMGRD (optOpcodeMask , pCurrReq -> bOptions)
+OPTMG (optRawInput , pCurrReq -> bOptions)
+OPTMG (optSendHttpHeader , pCurrReq -> bOptions)
+OPTMGRD (optDisableChdir , pCurrReq -> bOptions)
+OPTMG (optDisableHtmlScan , pCurrReq -> bOptions)
+OPTMGRD (optEarlyHttpHeader , pCurrReq -> bOptions)
+OPTMGRD (optDisableFormData , pCurrReq -> bOptions)
+OPTMG (optDisableInputScan , pCurrReq -> bOptions)
+OPTMG (optDisableTableScan , pCurrReq -> bOptions)
+OPTMG (optDisableMetaScan , pCurrReq -> bOptions)
+OPTMGRD (optAllFormData , pCurrReq -> bOptions)
+OPTMGRD (optRedirectStdout , pCurrReq -> bOptions)
+OPTMG (optUndefToEmptyValue , pCurrReq -> bOptions)
+OPTMG (optNoHiddenEmptyValue , pCurrReq -> bOptions)
+OPTMGRD (optAllowZeroFilesize , pCurrReq -> bOptions)
+OPTMGRD (optKeepSrcInMemory , pCurrReq -> bOptions)
+OPTMG (optKeepSpaces , pCurrReq -> bOptions)
+OPTMG (optOpenLogEarly , pCurrReq -> bOptions)
+OPTMG (optNoUncloseWarn , pCurrReq -> bOptions)
+
+
+OPTMG (dbgStd , pCurrReq -> bDebug)
+OPTMG (dbgMem , pCurrReq -> bDebug)
+OPTMG (dbgEval , pCurrReq -> bDebug)
+OPTMG (dbgCmd , pCurrReq -> bDebug)
+OPTMG (dbgEnv , pCurrReq -> bDebug)
+OPTMG (dbgForm , pCurrReq -> bDebug)
+OPTMG (dbgTab , pCurrReq -> bDebug)
+OPTMG (dbgInput , pCurrReq -> bDebug)
+OPTMG (dbgFlushOutput , pCurrReq -> bDebug)
+OPTMG (dbgFlushLog , pCurrReq -> bDebug)
+OPTMG (dbgAllCmds , pCurrReq -> bDebug)
+OPTMG (dbgSource , pCurrReq -> bDebug)
+OPTMG (dbgFunc , pCurrReq -> bDebug)
+OPTMG (dbgLogLink , pCurrReq -> bDebug)
+OPTMG (dbgDefEval , pCurrReq -> bDebug)
+OPTMG (dbgWatchScalar , pCurrReq -> bDebug)
+OPTMG (dbgHeadersIn , pCurrReq -> bDebug)
+OPTMG (dbgShowCleanup , pCurrReq -> bDebug)
+OPTMG (dbgProfile , pCurrReq -> bDebug)
+OPTMG (dbgSession , pCurrReq -> bDebug)
+OPTMG (dbgImport , pCurrReq -> bDebug)
/* ---------------------------------------------------------------------------- */
/* read form input from http server... */
@@ -1539,62 +1539,62 @@
rc = 0 ;
- ADDINTMG (TabCount) ;
- ADDINTMG (TabRow) ;
- ADDINTMG (TabCol) ;
- ADDINTMG (TabMaxRow) ;
- ADDINTMG (TabMaxCol) ;
- ADDINTMG (TabMode) ;
- ADDINTMG (EscMode) ;
+ ADDINTMG (TabCount)
+ ADDINTMG (TabRow)
+ ADDINTMG (TabCol)
+ ADDINTMG (TabMaxRow)
+ ADDINTMG (TabMaxCol)
+ ADDINTMG (TabMode)
+ ADDINTMG (EscMode)
#ifdef EP2
- ADDINTMG (CurrNode) ;
+ ADDINTMG (CurrNode)
#endif
- ADDOPTMG (optDisableVarCleanup ) ;
- ADDOPTMG (optDisableEmbperlErrorPage) ;
- ADDOPTMG (optReturnError) ;
- ADDOPTMG (optSafeNamespace ) ;
- ADDOPTMG (optOpcodeMask ) ;
- ADDOPTMG (optRawInput ) ;
- ADDOPTMG (optSendHttpHeader ) ;
- ADDOPTMG (optDisableChdir ) ;
- ADDOPTMG (optDisableHtmlScan ) ;
- ADDOPTMG (optEarlyHttpHeader ) ;
- ADDOPTMG (optDisableFormData ) ;
- ADDOPTMG (optDisableInputScan ) ;
- ADDOPTMG (optDisableTableScan ) ;
- ADDOPTMG (optDisableMetaScan ) ;
- ADDOPTMG (optAllFormData ) ;
- ADDOPTMG (optRedirectStdout ) ;
- ADDOPTMG (optUndefToEmptyValue ) ;
- ADDOPTMG (optNoHiddenEmptyValue ) ;
- ADDOPTMG (optAllowZeroFilesize ) ;
- ADDOPTMG (optKeepSrcInMemory ) ;
- ADDOPTMG (optKeepSpaces ) ;
- ADDOPTMG (optOpenLogEarly ) ;
- ADDOPTMG (optNoUncloseWarn ) ;
-
- ADDOPTMG (dbgStd ) ;
- ADDOPTMG (dbgMem ) ;
- ADDOPTMG (dbgEval ) ;
- ADDOPTMG (dbgCmd ) ;
- ADDOPTMG (dbgEnv ) ;
- ADDOPTMG (dbgForm ) ;
- ADDOPTMG (dbgTab ) ;
- ADDOPTMG (dbgInput ) ;
- ADDOPTMG (dbgFlushOutput ) ;
- ADDOPTMG (dbgFlushLog ) ;
- ADDOPTMG (dbgAllCmds ) ;
- ADDOPTMG (dbgSource ) ;
- ADDOPTMG (dbgFunc ) ;
- ADDOPTMG (dbgLogLink ) ;
- ADDOPTMG (dbgDefEval ) ;
- ADDOPTMG (dbgWatchScalar ) ;
- ADDOPTMG (dbgHeadersIn ) ;
- ADDOPTMG (dbgShowCleanup ) ;
- ADDOPTMG (dbgProfile ) ;
- ADDOPTMG (dbgSession ) ;
- ADDOPTMG (dbgImport ) ;
+ ADDOPTMG (optDisableVarCleanup )
+ ADDOPTMG (optDisableEmbperlErrorPage)
+ ADDOPTMG (optReturnError)
+ ADDOPTMG (optSafeNamespace )
+ ADDOPTMG (optOpcodeMask )
+ ADDOPTMG (optRawInput )
+ ADDOPTMG (optSendHttpHeader )
+ ADDOPTMG (optDisableChdir )
+ ADDOPTMG (optDisableHtmlScan )
+ ADDOPTMG (optEarlyHttpHeader )
+ ADDOPTMG (optDisableFormData )
+ ADDOPTMG (optDisableInputScan )
+ ADDOPTMG (optDisableTableScan )
+ ADDOPTMG (optDisableMetaScan )
+ ADDOPTMG (optAllFormData )
+ ADDOPTMG (optRedirectStdout )
+ ADDOPTMG (optUndefToEmptyValue )
+ ADDOPTMG (optNoHiddenEmptyValue )
+ ADDOPTMG (optAllowZeroFilesize )
+ ADDOPTMG (optKeepSrcInMemory )
+ ADDOPTMG (optKeepSpaces )
+ ADDOPTMG (optOpenLogEarly )
+ ADDOPTMG (optNoUncloseWarn )
+
+ ADDOPTMG (dbgStd )
+ ADDOPTMG (dbgMem )
+ ADDOPTMG (dbgEval )
+ ADDOPTMG (dbgCmd )
+ ADDOPTMG (dbgEnv )
+ ADDOPTMG (dbgForm )
+ ADDOPTMG (dbgTab )
+ ADDOPTMG (dbgInput )
+ ADDOPTMG (dbgFlushOutput )
+ ADDOPTMG (dbgFlushLog )
+ ADDOPTMG (dbgAllCmds )
+ ADDOPTMG (dbgSource )
+ ADDOPTMG (dbgFunc )
+ ADDOPTMG (dbgLogLink )
+ ADDOPTMG (dbgDefEval )
+ ADDOPTMG (dbgWatchScalar )
+ ADDOPTMG (dbgHeadersIn )
+ ADDOPTMG (dbgShowCleanup )
+ ADDOPTMG (dbgProfile )
+ ADDOPTMG (dbgSession )
+ ADDOPTMG (dbgImport )
#ifdef EP2
DomInit () ;
@@ -3067,9 +3067,16 @@
tConf * pConf = r -> pConf ;
tProcessor p2 = {2, "Embperl", embperl_CompileProcessor, NULL,
embperl_PreExecuteProcessor, embperl_ExecuteProcessor, "",
- pConf -> pCacheKeyCV, pConf -> bCacheKeyOptions, pConf ->
nExpiresIn, pConf -> pExpiresCV, NULL } ;
- tProcessor p1 = {1, "Parser", embperl_ParseProcessor, NULL, NULL,
NULL, "", NULL, 0, 0, NULL, &p2 } ;
-
+ NULL, 0, 0, NULL, NULL } ;
+ tProcessor p1 = {1, "Parser", embperl_ParseProcessor, NULL, NULL,
NULL, "", NULL, 0, 0, NULL, NULL } ;
+
+ /* do this here to make stupid compiler happy (sun cc) */
+ p2.pCacheKeyCV = pConf -> pCacheKeyCV ;
+ p2.bCacheKeyOptions = pConf -> bCacheKeyOptions ;
+ p2.nOutputExpiresIn = pConf -> nExpiresIn ;
+ p2.pOutputExpiresCV = pConf -> pExpiresCV ;
+ p1.pNext = &p2 ;
+
if (p2.pCacheKeyCV)
SvREFCNT_inc (p2.pCacheKeyCV) ;
1.19.4.9 +3 -2 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.19.4.8
retrieving revision 1.19.4.9
diff -u -r1.19.4.8 -r1.19.4.9
--- epnames.h 2001/05/15 14:20:04 1.19.4.8
+++ epnames.h 2001/06/12 18:28:56 1.19.4.9
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epnames.h,v 1.19.4.8 2001/05/15 14:20:04 richter Exp $
+# $Id: epnames.h,v 1.19.4.9 2001/06/12 18:28:56 richter Exp $
#
###################################################################################*/
@@ -392,4 +392,5 @@
#endif /* endif WIN32 */
-#endif /* APACHE */
\ No newline at end of file
+#endif /* APACHE */
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
