windows build fix attempt

Author: devnexen

ext/intl/dateformat/dateformat_class.h

@@ -16,9 +16,15 @@
 
 #include <php.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include "intl_common.h"
 #include "intl_error.h"
 #include "intl_data.h"
+#ifdef __cplusplus
+}
+#endif
 #include "dateformat_data.h"
 
 typedef struct {

ext/intl/dateformat/dateformat_format.cpp

@@ -17,7 +17,7 @@
 #endif
 
 #include <unicode/ustring.h>
-#include <unicode/ucal.h>
+#include <unicode/unum.h>
 
 extern "C" {
 #include "../php_intl.h"

ext/intl/resourcebundle/resourcebundle_class.cpp

@@ -16,16 +16,19 @@
 #include <unicode/ures.h>
 #include <unicode/uenum.h>
 
+
+extern "C" {
 #include <zend.h>
+#include <php.h>
+}
+
 #include <Zend/zend_exceptions.h>
 #include <Zend/zend_interfaces.h>
-#include <php.h>
 
 extern "C" {
 #include "php_intl.h"
 #include "intl_data.h"
 #include "intl_common.h"
-
 #include "resourcebundle/resourcebundle.h"
 #include "resourcebundle/resourcebundle_iterator.h"
 #include "resourcebundle/resourcebundle_class.h"
@@ -413,7 +416,7 @@ PHP_METHOD(ResourceBundle, getIterator) {
 /* {{{ resourcebundle_register_class
  * Initialize 'ResourceBundle' class
  */
-void resourcebundle_register_class( void )
+U_CFUNC void resourcebundle_register_class( void )
 {
 	ResourceBundle_ce_ptr = register_class_ResourceBundle(zend_ce_aggregate, zend_ce_countable);
 	ResourceBundle_ce_ptr->create_object = ResourceBundle_object_create;

ext/intl/resourcebundle/resourcebundle_class.h

@@ -18,9 +18,14 @@
 #include <unicode/ures.h>
 
 #include <zend.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include "php.h"
-
 #include "intl_error.h"
+#ifdef __cplusplus
+}
+#endif
 
 typedef struct {
 	intl_error      error;
@@ -50,9 +55,9 @@ static inline ResourceBundle_object *php_intl_resourcebundle_fetch_object(zend_o
 extern "C" {
 #endif
 void resourcebundle_register_class( void );
+extern zend_class_entry *ResourceBundle_ce_ptr;
 #ifdef __cplusplus
 }
 #endif
-extern zend_class_entry *ResourceBundle_ce_ptr;
 
 #endif // #ifndef RESOURCEBUNDLE_CLASS_H

ext/intl/resourcebundle/resourcebundle_iterator.cpp

@@ -12,9 +12,11 @@
    +----------------------------------------------------------------------+
  */
 
+extern "C" {
 #include <php.h>
 #include <zend.h>
 #include <zend_API.h>
+}
 
 #include "resourcebundle/resourcebundle.h"
 #include "resourcebundle/resourcebundle_class.h"