cvs: php4 /ext/iisfunc setup.c setup.h

fmk Tue Sep 25 23:33:44 2001 EDT Modified files: /php4/ext/iisfunc setup.h setup.c Log: Fixing Win32 build...after the last macro convertions. Index: php4/ext/iisfunc/setup.h diff -u php4/ext/iisfunc/setup.h:1.5 php4/ext/iisfunc/setup.h:1.6 --- php4/ext/iisfunc/setup.h:1.5 Thu Sep 20 13:41:51 2001 +++ php4/ext/iisfunc/setup.h Tue Sep 25 23:33:44 2001 @@ -15,14 +15,12 @@ | Authors: Frank M. Kromann <fmk@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: setup.h,v 1.5 2001/09/20 17:41:51 fmk Exp $ */ +/* $Id: setup.h,v 1.6 2001/09/26 03:33:44 fmk Exp $ */ #ifndef PHP_IIS_SETUP_H #define PHP_IIS_SETUP_H #ifdef PHP_WIN32 - -//#define HAVE_IISFUNC extern zend_module_entry iisfunc_module_entry; #define iisfunc_module_ptr &iisfunc_module_entry Index: php4/ext/iisfunc/setup.c diff -u php4/ext/iisfunc/setup.c:1.9 php4/ext/iisfunc/setup.c:1.10 --- php4/ext/iisfunc/setup.c:1.9 Tue Sep 25 17:57:58 2001 +++ php4/ext/iisfunc/setup.c Tue Sep 25 23:33:44 2001 @@ -15,7 +15,7 @@ | Authors: Frank M. Kromann <fmk@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: setup.c,v 1.9 2001/09/25 21:57:58 jeroen Exp $ */ +/* $Id: setup.c,v 1.10 2001/09/26 03:33:44 fmk Exp $ */ #ifdef COMPILE_DL_IISFUNC #define HAVE_IISFUNC 1 @@ -143,7 +143,7 @@ convert_to_string(ServerPath); - rc = fnIisGetServerByPath(ServerPZ_STRVAL_P(ath) TSRMLS_CC); + rc = fnIisGetServerByPath(Z_STRVAL_P(ServerPath) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -168,7 +168,7 @@ convert_to_string(ServerComment); - rc = fnIisGetServerByComment(ServerCZ_STRVAL_P(omment) TSRMLS_CC); + rc = fnIisGetServerByComment(Z_STRVAL_P(ServerComment) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -199,13 +199,13 @@ convert_to_long(ServerRights); convert_to_long(StartServer); - rc = fnIisAddServer(ServerPZ_STRVAL_P(ath), - ServerCZ_STRVAL_P(omment), - ServerIZ_STRVAL_P(p), - ServerPZ_STRVAL_P(ort), - ServerHZ_STRVAL_P(ost), - ServerRZ_LVAL_P(ights), - StartSZ_LVAL_P(erver) TSRMLS_CC); + rc = fnIisAddServer(Z_STRVAL_P(ServerPath), + Z_STRVAL_P(ServerComment), + Z_STRVAL_P(ServerIp), + Z_STRVAL_P(ServerPort), + Z_STRVAL_P(ServerHost), + Z_LVAL_P(ServerRights), + Z_LVAL_P(StartServer) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -229,7 +229,7 @@ convert_to_long(ServerInstance); - rc = fnIisRemoveServer(ServerIZ_LVAL_P(nstance) TSRMLS_CC); + rc = fnIisRemoveServer(Z_LVAL_P(ServerInstance) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -255,7 +255,7 @@ convert_to_string(VirtualPath); convert_to_long(DirFlags); - rc = fnIisSetDirSecurity(ServerIZ_LVAL_P(nstance), VirtualPZ_STRVAL_P(ath), DirFZ_LVAL_P(lags) TSRMLS_CC); + rc = fnIisSetDirSecurity(Z_LVAL_P(ServerInstance), Z_STRVAL_P(VirtualPath), Z_LVAL_P(DirFlags) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -281,7 +281,7 @@ convert_to_long(ServerInstance); convert_to_string(VirtualPath); - rc = fnIisGetDirSecurity(ServerIZ_LVAL_P(nstance), VirtualPZ_STRVAL_P(ath), &DirFlags TSRMLS_CC); + rc = fnIisGetDirSecurity(Z_LVAL_P(ServerInstance), Z_STRVAL_P(VirtualPath), &DirFlags TSRMLS_CC); if (rc) { RETVAL_LONG(DirFlags); } @@ -307,7 +307,7 @@ convert_to_string(VirtualPath); convert_to_long(ServerFlags); - rc = fnIisSetServerRight(ServerIZ_LVAL_P(nstance), VirtualPZ_STRVAL_P(ath), ServerFZ_LVAL_P(lags) TSRMLS_CC); + rc = fnIisSetServerRight(Z_LVAL_P(ServerInstance), Z_STRVAL_P(VirtualPath), Z_LVAL_P(ServerFlags) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -333,7 +333,7 @@ convert_to_long(ServerInstance); convert_to_string(VirtualPath); - rc = fnIisGetServerRight(ServerIZ_LVAL_P(nstance), VirtualPZ_STRVAL_P(ath), &DirFlags TSRMLS_CC); + rc = fnIisGetServerRight(Z_LVAL_P(ServerInstance), Z_STRVAL_P(VirtualPath), &DirFlags TSRMLS_CC); if (rc) { RETVAL_LONG(DirFlags); } @@ -362,9 +362,9 @@ convert_to_string(EnginePath); convert_to_long(Scripting); - sprintf(ScriptingValue, "%s,%s,%li", ScriptEZ_STRVAL_P(xtention), EnginePZ_STRVAL_P(ath), SZ_LVAL_P(cripting)); + sprintf(ScriptingValue, "%s,%s,%li", Z_STRVAL_P(ScriptExtention), Z_STRVAL_P(EnginePath), Z_LVAL_P(Scripting)); - rc = fnIisSetScriptMap(ServerIZ_LVAL_P(nstance), VirtualPZ_STRVAL_P(ath), ScriptingValue TSRMLS_CC); + rc = fnIisSetScriptMap(Z_LVAL_P(ServerInstance), Z_STRVAL_P(VirtualPath), ScriptingValue TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -394,7 +394,7 @@ convert_to_string(VirtualPath); convert_to_string(ScriptExtention); - rc = fnIisGetScriptMap(ServerIZ_LVAL_P(nstance), VirtualPZ_STRVAL_P(ath), ScriptEZ_STRVAL_P(xtention), strSetting TSRMLS_CC); + rc = fnIisGetScriptMap(Z_LVAL_P(ServerInstance), Z_STRVAL_P(VirtualPath), Z_STRVAL_P(ScriptExtention), strSetting TSRMLS_CC); if (rc == 1 && strlen(strSetting)) { RETVAL_STRING(strSetting, 1); } @@ -421,7 +421,7 @@ convert_to_string(VirtualPath); convert_to_string(Name); - rc = fnIisSetAppSettings(ServerIZ_LVAL_P(nstance), VirtualPZ_STRVAL_P(ath), NZ_STRVAL_P(ame) TSRMLS_CC); + rc = fnIisSetAppSettings(Z_LVAL_P(ServerInstance), Z_STRVAL_P(VirtualPath), Z_STRVAL_P(Name) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -446,7 +446,7 @@ convert_to_long(ServerInstance); - rc = fnIisSetServerStatus(ServerIZ_LVAL_P(nstance), 1 TSRMLS_CC); + rc = fnIisSetServerStatus(Z_LVAL_P(ServerInstance), 1 TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -471,7 +471,7 @@ convert_to_long(ServerInstance); - rc = fnIisSetServerStatus(ServerIZ_LVAL_P(nstance), 0 TSRMLS_CC); + rc = fnIisSetServerStatus(Z_LVAL_P(ServerInstance), 0 TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -496,7 +496,7 @@ convert_to_string(ServiceId); - rc = fnStopService(ServiceIZ_STRVAL_P(d) TSRMLS_CC); + rc = fnStopService(Z_STRVAL_P(ServiceId) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -521,7 +521,7 @@ convert_to_string(ServiceId); - rc = fnStartService(ServiceIZ_STRVAL_P(d) TSRMLS_CC); + rc = fnStartService(Z_STRVAL_P(ServiceId) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); } @@ -546,7 +546,7 @@ convert_to_string(ServiceId); - rc = fnGetServiceState(ServiceIZ_STRVAL_P(d) TSRMLS_CC); + rc = fnGetServiceState(Z_STRVAL_P(ServiceId) TSRMLS_CC); if (rc) { RETVAL_LONG(rc); }