(hopefully) fix the build..

diff --git a/sapi/activescript/php4activescript.c b/sapi/activescript/php4activescript.c
index a3324f2c44ad0d46f8cdcd6990c756366b7cbb1e..0dc6bd7e46d8d92f516de850aa340ae5cadd2500 100644 (file)
--- a/sapi/activescript/php4activescript.c
+++ b/sapi/activescript/php4activescript.c
@@ -17,6 +17,8 @@
  */
 /* $Id$ */
 
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
 #include "php.h"
 #include "php_main.h"
 #include "SAPI.h"

diff --git a/sapi/activescript/scriptengine.cpp b/sapi/activescript/scriptengine.cpp
index ca751c2a5ff19b0c38465b9880ce00099dad0c5c..e21e6afec400dafcc712f5ad22a21c222270c384 100644 (file)
--- a/sapi/activescript/scriptengine.cpp
+++ b/sapi/activescript/scriptengine.cpp
@@ -30,6 +30,7 @@
  * */
 
 #define _WIN32_DCOM
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #include "php.h"
 extern "C" {
@@ -42,9 +43,9 @@ extern "C" {
 #include "php_variables.h"
 #include "php_ini.h"
 #include "php4activescript.h"
-#include "ext/com/com.h"
-#include "ext/com/php_COM.h"
-#include "ext/com/conversion.h"
+#include "ext/rpc/com/com.h"
+#include "ext/rpc/com/php_COM.h"
+#include "ext/rpc/com/conversion.h"
 }
 #include "php_ticks.h"
 #include "php4as_scriptengine.h"