Remove static to global.

Author: jmjoy

examples/simple/src/lib.rs

@@ -1,6 +1,3 @@
-#![feature(allocator_api)]
-#![feature(const_raw_ptr_deref)]
-
 use phper::{c_str_ptr, php_fn, ebox};
 use phper::sys::{ZEND_RESULT_CODE_SUCCESS, zend_parse_parameters, zend_internal_arg_info, zend_function_entry, PHP_INI_SYSTEM};
 use phper::sys::{zend_ini_entry_def, zend_module_entry, zend_register_ini_entries, zend_unregister_ini_entries, OnUpdateBool};
@@ -92,69 +89,69 @@ pub fn test_simple(execute_data: ExecuteData) -> impl SetVal {
     }
 }
 
-#[zend_get_module]
-pub fn get_module() -> &'static ModuleEntry {
-    static ARG_INFO_TEST_SIMPLE: InternalArgInfos<3> = InternalArgInfos::new([
-        zend_internal_arg_info {
-            name: 2 as *const _,
-            type_: 0,
-            pass_by_reference: 0,
-            is_variadic: 0,
-        },
-        zend_internal_arg_info {
-            name: c_str_ptr!("a"),
-            type_: 0,
-            pass_by_reference: 0,
-            is_variadic: 0,
-        },
-        zend_internal_arg_info {
-            name: c_str_ptr!("b"),
-            type_: 0,
-            pass_by_reference: 0,
-            is_variadic: 0,
-        },
-    ]);
+static ARG_INFO_TEST_SIMPLE: InternalArgInfos<3> = InternalArgInfos::new([
+    zend_internal_arg_info {
+        name: 2 as *const _,
+        type_: 0,
+        pass_by_reference: 0,
+        is_variadic: 0,
+    },
+    zend_internal_arg_info {
+        name: c_str_ptr!("a"),
+        type_: 0,
+        pass_by_reference: 0,
+        is_variadic: 0,
+    },
+    zend_internal_arg_info {
+        name: c_str_ptr!("b"),
+        type_: 0,
+        pass_by_reference: 0,
+        is_variadic: 0,
+    },
+]);
 
-    static FUNCTION_ENTRIES: FunctionEntries<2> = FunctionEntries::new([
-        zend_function_entry {
-            fname: c_str_ptr!("test_simple"),
-            handler: Some(php_fn!(test_simple)),
-            arg_info: ARG_INFO_TEST_SIMPLE.get(),
-            num_args: 2,
-            flags: 0,
-        },
-        unsafe { transmute([0u8; size_of::<zend_function_entry>()]) },
-    ]);
+static FUNCTION_ENTRIES: FunctionEntries<2> = FunctionEntries::new([
+    zend_function_entry {
+        fname: c_str_ptr!("test_simple"),
+        handler: Some(php_fn!(test_simple)),
+        arg_info: ARG_INFO_TEST_SIMPLE.get(),
+        num_args: 2,
+        flags: 0,
+    },
+    unsafe { transmute([0u8; size_of::<zend_function_entry>()]) },
+]);
 
-    static MODULE_ENTRY: ModuleEntry = ModuleEntry::new(zend_module_entry {
-        size: size_of::<zend_module_entry>() as c_ushort,
-        zend_api: phper::sys::ZEND_MODULE_API_NO as c_uint,
-        zend_debug: phper::sys::ZEND_DEBUG as c_uchar,
-        zts: phper::sys::USING_ZTS as c_uchar,
-        ini_entry: std::ptr::null(),
-        deps: std::ptr::null(),
-        name: c_str_ptr!(env!("CARGO_PKG_NAME")),
-        functions: FUNCTION_ENTRIES.get(),
-        module_startup_func: Some(php_minit!(m_init_simple)),
-        module_shutdown_func: Some(php_mshutdown!(m_shutdown_simple)),
-        request_startup_func: Some(php_rinit!(r_init_simple)),
-        request_shutdown_func: Some(php_rshutdown!(r_shutdown_simple)),
-        info_func: Some(php_minfo!(m_info_simple)),
-        version: c_str_ptr!(env!("CARGO_PKG_VERSION")),
-        globals_size: 0usize,
-        #[cfg(phper_zts)]
-        globals_id_ptr: std::ptr::null_mut(),
-        #[cfg(not(phper_zts))]
-        globals_ptr: std::ptr::null_mut(),
-        globals_ctor: None,
-        globals_dtor: None,
-        post_deactivate_func: None,
-        module_started: 0,
-        type_: 0,
-        handle: null_mut(),
-        module_number: 0,
-        build_id: phper::sys::PHP_MODULE_BUILD_ID,
-    });
+static MODULE_ENTRY: ModuleEntry = ModuleEntry::new(zend_module_entry {
+    size: size_of::<zend_module_entry>() as c_ushort,
+    zend_api: phper::sys::ZEND_MODULE_API_NO as c_uint,
+    zend_debug: phper::sys::ZEND_DEBUG as c_uchar,
+    zts: phper::sys::USING_ZTS as c_uchar,
+    ini_entry: std::ptr::null(),
+    deps: std::ptr::null(),
+    name: c_str_ptr!(env!("CARGO_PKG_NAME")),
+    functions: FUNCTION_ENTRIES.get(),
+    module_startup_func: Some(php_minit!(m_init_simple)),
+    module_shutdown_func: Some(php_mshutdown!(m_shutdown_simple)),
+    request_startup_func: Some(php_rinit!(r_init_simple)),
+    request_shutdown_func: Some(php_rshutdown!(r_shutdown_simple)),
+    info_func: Some(php_minfo!(m_info_simple)),
+    version: c_str_ptr!(env!("CARGO_PKG_VERSION")),
+    globals_size: 0usize,
+    #[cfg(phper_zts)]
+    globals_id_ptr: std::ptr::null_mut(),
+    #[cfg(not(phper_zts))]
+    globals_ptr: std::ptr::null_mut(),
+    globals_ctor: None,
+    globals_dtor: None,
+    post_deactivate_func: None,
+    module_started: 0,
+    type_: 0,
+    handle: null_mut(),
+    module_number: 0,
+    build_id: phper::sys::PHP_MODULE_BUILD_ID,
+});
 
+#[zend_get_module]
+pub fn get_module() -> &'static ModuleEntry {
     &MODULE_ENTRY
 }

phper/src/zend/api.rs

@@ -4,7 +4,6 @@ use std::os::raw::{c_char, c_int, c_void};
 use crate::zend::ini::Mh;
 use std::ptr::null_mut;
 
-#[repr(C)]
 pub struct ModuleGlobals<T: 'static> {
     inner: UnsafeCell<T>,
 }