sniper Thu Aug 28 10:58:01 2003 EDT
Modified files:
/php-src/ext/mcve .cvsignore mcve.dsp config.m4 mcve.c php_mcve.h
Log:
MFB
Index: php-src/ext/mcve/.cvsignore
diff -u /dev/null php-src/ext/mcve/.cvsignore:1.2
--- /dev/null Thu Aug 28 10:58:01 2003
+++ php-src/ext/mcve/.cvsignore Thu Aug 28 10:58:01 2003
@@ -0,0 +1,20 @@
+*.lo
+*.la
+.deps
+*.plg
+*.opt
+*.ncb
+Release
+Release_inline
+Debug_TS
+Release_TS
+Release_TSDbg
+Release_TS_inline
+Debug_TS
+Release_bundled
+Release_inline_bundled
+Debug_bundled
+Release_TS_bundled
+Release_TSDbg_bundled
+Release_TS_inline_bundled
+Debug_TS_bundled
Index: php-src/ext/mcve/mcve.dsp
diff -u /dev/null php-src/ext/mcve/mcve.dsp:1.2
--- /dev/null Thu Aug 28 10:58:01 2003
+++ php-src/ext/mcve/mcve.dsp Thu Aug 28 10:58:01 2003
@@ -0,0 +1,107 @@
+# Microsoft Developer Studio Project File - Name="mcve" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=mcve - Win32 Debug_TS
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "mcve.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "mcve.mak" CFG="mcve - Win32 Debug_TS"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "mcve - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mcve - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "mcve - Win32 Release_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release_TS"
+# PROP BASE Intermediate_Dir "Release_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_TS"
+# PROP Intermediate_Dir "Release_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "MCVE_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I
"..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_MCVE"
/D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_MCVE=1 /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "NDEBUG"
+# ADD RSC /l 0x407 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 php4ts.lib libmcve.lib ssleay32.lib libeay32.lib 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
/out:"..\..\Release_TS/php_mcve.dll" /libpath:"..\..\Release_TS"
/libpath:"..\..\Release_TS_Inline"
+
+!ELSEIF "$(CFG)" == "mcve - Win32 Debug_TS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug_TS"
+# PROP BASE Intermediate_Dir "Debug_TS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_TS"
+# PROP Intermediate_Dir "Debug_TS"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "mcve_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\main" /I "..\..\Zend"
/I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"COMPILE_DL_MCVE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_MCVE=1 /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 php4ts_debug.lib libmcve.lib ssleay32.lib libeay32.lib 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
/out:"..\..\Debug_TS/php_mcve.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+
+!ENDIF
+
+# Begin Target
+
+# Name "mcve - Win32 Release_TS"
+# Name "mcve - Win32 Debug_TS"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\mcve.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\php_mcve.h
+# End Source File
+# End Group
+# End Target
+# End Project
Index: php-src/ext/mcve/config.m4
diff -u php-src/ext/mcve/config.m4:1.2 php-src/ext/mcve/config.m4:1.3
--- php-src/ext/mcve/config.m4:1.2 Tue Mar 12 11:24:16 2002
+++ php-src/ext/mcve/config.m4 Thu Aug 28 10:58:01 2003
@@ -22,4 +22,5 @@
PHP_ADD_LIBRARY_WITH_PATH(mcve, $MCVE_DIR/lib, MCVE_SHARED_LIBADD)
PHP_NEW_EXTENSION(mcve, mcve.c, $ext_shared)
PHP_SUBST(MCVE_SHARED_LIBADD)
+ AC_DEFINE(HAVE_MCVE, 1, [ ])
fi
Index: php-src/ext/mcve/mcve.c
diff -u php-src/ext/mcve/mcve.c:1.23 php-src/ext/mcve/mcve.c:1.24
--- php-src/ext/mcve/mcve.c:1.23 Wed Aug 20 15:45:06 2003
+++ php-src/ext/mcve/mcve.c Thu Aug 28 10:58:01 2003
@@ -17,7 +17,13 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mcve.c,v 1.23 2003/08/20 19:45:06 bradmssw Exp $ */
+/* $Id: mcve.c,v 1.24 2003/08/28 14:58:01 sniper Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_MCVE
/* standard php include(s) */
#include "php.h"
@@ -39,7 +45,7 @@
/* }}} */
/* {{{ extension definition structures */
-
+static unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE };
function_entry mcve_functions[] = {
PHP_FE(mcve_initengine, NULL)
PHP_FE(mcve_initconn, NULL)
@@ -76,7 +82,7 @@
PHP_FE(mcve_monitor, NULL)
PHP_FE(mcve_transinqueue, NULL)
PHP_FE(mcve_checkstatus, NULL)
- PHP_FE(mcve_completeauthorizations, second_arg_force_ref)
+ PHP_FE(mcve_completeauthorizations, second_args_force_ref)
PHP_FE(mcve_sale, NULL)
PHP_FE(mcve_preauth, NULL)
PHP_FE(mcve_void, NULL)
@@ -147,7 +153,7 @@
#endif
/* {{{ MCVE_CONN destructor */
-static void _free_mcve_conn(zend_rsrc_list_entry *rsrc)
+static void _free_mcve_conn(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
MCVE_CONN *conn;
@@ -502,7 +508,9 @@
Destroy the connection and MCVE_CONN structure */
PHP_FUNCTION(mcve_destroyconn)
{
+#if 0
MCVE_CONN *conn;
+#endif
zval **arg;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE)
@@ -2248,6 +2256,8 @@
}
}
/* }}} */
+
+#endif
/* END OF MCVE PHP EXTENSION */
Index: php-src/ext/mcve/php_mcve.h
diff -u php-src/ext/mcve/php_mcve.h:1.11 php-src/ext/mcve/php_mcve.h:1.12
--- php-src/ext/mcve/php_mcve.h:1.11 Mon Jul 7 22:59:50 2003
+++ php-src/ext/mcve/php_mcve.h Thu Aug 28 10:58:01 2003
@@ -16,7 +16,7 @@
| Chris Faulhaber <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_mcve.h,v 1.11 2003/07/08 02:59:50 bradmssw Exp $ */
+/* $Id: php_mcve.h,v 1.12 2003/08/28 14:58:01 sniper Exp $ */
#ifndef _PHP_MCVE_H
#define _PHP_MCVE_H
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
