changed variable names to *_class_functions

diff --git a/ext/satellite/object.c b/ext/satellite/object.c
index 6167915f046325c2dfaa8ae7dfbfee517a55d9de..6e322bb41d9f92d2562f3f2f9778097c8a1159b0 100644 (file)
--- a/ext/satellite/object.c
+++ b/ext/satellite/object.c
@@ -58,7 +58,7 @@ struct _OrbitObject
 static void OrbitObject_Wakeup(INTERNAL_FUNCTION_PARAMETERS);
 static void OrbitObject_Sleep(INTERNAL_FUNCTION_PARAMETERS);
 
-static zend_function_entry OrbitObject_functions[] =
+static zend_function_entry OrbitObject_class_functions[] =
 {
        {"__sleep", OrbitObject_Sleep},
        {"__wakeup", OrbitObject_Wakeup},
@@ -70,7 +70,7 @@ IMPLEMENT_DECLARATIONS(name, flags)           \
 IMPLEMENT_FUNCTION_CALL(name, flags)   \
 IMPLEMENT_PUT_PROPERTY(name, flags)            \
 IMPLEMENT_GET_PROPERTY(name, flags)            \
-IMPLEMENT_INIT_EX(name, flags, ##name##_functions, _##name##_FunctionCall, _##name##_GetProperty, _##name##_PutProperty)\
+IMPLEMENT_INIT_EX(name, flags, ##name##_class_functions, _##name##_FunctionCall, _##name##_GetProperty, _##name##_PutProperty)\
 IMPLEMENT_DATA_HELPERS(name, flags)
        
 MY_IMPLEMENT_CLASS(OrbitObject, ~0);

diff --git a/ext/satellite/struct.c b/ext/satellite/struct.c
index 6720da94b7a28b523a01a729ce4506b64afeb035..2086deb1aeca8c5b69e118108a496ef1f6044270 100644 (file)
--- a/ext/satellite/struct.c
+++ b/ext/satellite/struct.c
@@ -58,7 +58,7 @@ struct _OrbitStruct
 static void OrbitStruct_Wakeup(INTERNAL_FUNCTION_PARAMETERS);
 static void OrbitStruct_Sleep(INTERNAL_FUNCTION_PARAMETERS);
 
-static zend_function_entry OrbitStruct_functions[] =
+static zend_function_entry OrbitStruct_class_functions[] =
 {
        {"__sleep", OrbitStruct_Sleep},
        {"__wakeup", OrbitStruct_Wakeup},
@@ -70,7 +70,7 @@ IMPLEMENT_DECLARATIONS(name, flags)           \
 IMPLEMENT_FUNCTION_CALL(name, flags)   \
 IMPLEMENT_PUT_PROPERTY(name, flags)            \
 IMPLEMENT_GET_PROPERTY(name, flags)            \
-IMPLEMENT_INIT_EX(name, flags, ##name##_functions, _##name##_FunctionCall, _##name##_GetProperty, _##name##_PutProperty)\
+IMPLEMENT_INIT_EX(name, flags, ##name##_class_functions, _##name##_FunctionCall, _##name##_GetProperty, _##name##_PutProperty)\
 IMPLEMENT_DATA_HELPERS(name, flags)
        
 MY_IMPLEMENT_CLASS(OrbitStruct, NO_FUNCTIONS);