ext/intl: convert C part to C++ step 1. (#19231)

Author: devnexen

ext/intl/config.m4

@@ -33,12 +33,8 @@ if test "$PHP_INTL" != "no"; then
       formatter/formatter_parse.c
       grapheme/grapheme_string.c
       grapheme/grapheme_util.c
-      idn/idn.c
       intl_convert.c
       intl_error.c
-      locale/locale_class.c
-      locale/locale_methods.c
-      locale/locale.c
       listformatter/listformatter_class.c
       msgformat/msgformat_attr.c
       msgformat/msgformat_class.c
@@ -57,7 +53,6 @@ if test "$PHP_INTL" != "no"; then
       spoofchecker/spoofchecker_main.c
       transliterator/transliterator_class.c
       transliterator/transliterator_methods.c
-      uchar/uchar.c
     ]),
     [$ext_shared],,
     [$INTL_COMMON_FLAGS],
@@ -83,7 +78,12 @@ if test "$PHP_INTL" != "no"; then
     breakiterator/breakiterator_methods.cpp \
     breakiterator/rulebasedbreakiterator_methods.cpp \
     breakiterator/codepointiterator_internal.cpp \
-    breakiterator/codepointiterator_methods.cpp"
+    breakiterator/codepointiterator_methods.cpp \
+    idn/idn.cpp \
+    locale/locale_class.cpp \
+    locale/locale_methods.cpp \
+    locale/locale.cpp \
+    uchar/uchar.cpp"
 
   PHP_REQUIRE_CXX()
 

ext/intl/config.w32

@@ -43,9 +43,9 @@ if (PHP_INTL != "no") {
 				listformatter_class.c \
 				", "intl");
 		ADD_SOURCES(configure_module_dirname + "/locale", "\
-				locale.c \
-				locale_class.c \
-				locale_methods.c \
+				locale.cpp \
+				locale_class.cpp \
+				locale_methods.cpp \
 				", "intl");
 		ADD_SOURCES(configure_module_dirname + "/msgformat", "\
 				msgformat.c \
@@ -78,10 +78,10 @@ if (PHP_INTL != "no") {
 				datepatterngenerator_methods.cpp \
 				", "intl");
 		ADD_SOURCES(configure_module_dirname + "/uchar", "\
-				uchar.c",
+				uchar.cpp",
 				"intl");
 		ADD_SOURCES(configure_module_dirname + "/idn", "\
-				idn.c",
+				idn.cpp",
 				"intl");
 		ADD_SOURCES(configure_module_dirname + "/resourcebundle", "\
 				resourcebundle.c \

ext/intl/idn/idn.c ext/intl/idn/idn.cppext/intl/idn/idn.c renamed to ext/intl/idn/idn.cpp

@@ -26,7 +26,10 @@
 #include <unicode/ustring.h>
 
 #include "idn.h"
+
+extern "C" {
 #include "intl_error.h"
+}
 /* }}} */
 
 enum {
@@ -145,15 +148,15 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode)
 }
 
 /* {{{ Converts an Unicode domain to ASCII representation, as defined in the IDNA RFC */
-PHP_FUNCTION(idn_to_ascii)
+U_CFUNC PHP_FUNCTION(idn_to_ascii)
 {
 	php_intl_idn_handoff(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_ASCII);
 }
 /* }}} */
 
 
 /* {{{ Converts an ASCII representation of the domain to Unicode (UTF-8), as defined in the IDNA RFC */
-PHP_FUNCTION(idn_to_utf8)
+U_CFUNC PHP_FUNCTION(idn_to_utf8)
 {
 	php_intl_idn_handoff(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTL_IDN_TO_UTF8);
 }

ext/intl/locale/locale.c ext/intl/locale/locale.cppext/intl/locale/locale.c renamed to ext/intl/locale/locale.cpp

@@ -13,11 +13,13 @@
 */
 
 #include <unicode/uloc.h>
+extern "C" {
 #include "php_intl.h"
 #include "intl_error.h"
 #include "locale_class.h"
 #include "locale.h"
 #include "locale_arginfo.h"
+}
 
 zend_class_entry *Locale_ce_ptr = NULL;
 
@@ -28,7 +30,7 @@ zend_class_entry *Locale_ce_ptr = NULL;
 /* {{{ locale_register_Locale_class
  * Initialize 'Locale' class
  */
-void locale_register_Locale_class( void )
+U_CFUNC void locale_register_Locale_class( void )
 {
 	/* Create and register 'Locale' class. */
 	Locale_ce_ptr = register_class_Locale();

ext/intl/locale/locale_class.c ext/intl/locale/locale_class.cppext/intl/locale/locale_class.c renamed to ext/intl/locale/locale_class.cpp

@@ -31,7 +31,7 @@ typedef struct {
 } Locale_object;
 
 
-void locale_register_Locale_class( void );
+U_CFUNC void locale_register_Locale_class( void );
 
 extern zend_class_entry *Locale_ce_ptr;