phanto Mon Jan 29 13:54:53 2001 EDT
Modified files:
/php4/ext/dotnet dotnet.cpp
Log:
use *_EXTERN_C() and PHP_WIN32
Index: php4/ext/dotnet/dotnet.cpp
diff -u php4/ext/dotnet/dotnet.cpp:1.2 php4/ext/dotnet/dotnet.cpp:1.3
--- php4/ext/dotnet/dotnet.cpp:1.2 Sat Jan 27 19:41:22 2001
+++ php4/ext/dotnet/dotnet.cpp Mon Jan 29 13:54:45 2001
@@ -34,20 +34,15 @@
#include <math.h>
#include <comdef.h>
-extern "C" {
+extern "C" { /* this should be included in the includes itself !! */
+
#include "php.h"
#include "php_ini.h"
-OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen);
}
-pval php_COM_get_property_handler(zend_property_reference *property_reference);
-int php_COM_set_property_handler(zend_property_reference *property_reference, pval
*value);
-char *php_COM_error_message(HRESULT hr);
-void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS,
zend_property_reference *property_reference);
-int php_COM_get_le_idispatch();
-
#include "../com/conversion.h"
+#include "../com/php_COM.h"
#include "Mscoree.h"
#include "mscorlib.h"
@@ -220,8 +215,8 @@
"dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL,
NULL, PHP_MINFO(DOTNET), STANDARD_MODULE_PROPERTIES
};
-extern "C" {
- ZEND_GET_MODULE(dotnet)
-}
+BEGIN_EXTERN_C()
+ZEND_GET_MODULE(dotnet)
+END_EXTERN_C()
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
