cvs: /php4/ext/com COM.c /php4/ext/standard basic_functions.c datetime.c /php4/tests testobj

andi Mon Jul 26 12:54:41 1999 EDT Modified files: /php4/ext/com COM.c /php4/ext/standard basic_functions.c datetime.c /php4/tests testobj Log: - Fix the new operator incompatibility. - I commented PHP_FUNCTION(strtotime) in datetime.c because it stopped win32 from compiling. This needs to be fixed!!! - Check out libzend to compile the tree now. Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.8 php4/ext/com/COM.c:1.9 --- php4/ext/com/COM.c:1.8 Fri Jul 16 09:12:43 1999 +++ php4/ext/com/COM.c Mon Jul 26 12:54:40 1999 @@ -675,7 +675,7 @@ zend_overloaded_element *overloaded_property; zend_llist_element *element; pval **idispatch_handle; - pval *object = *property_reference->object; + pval *object = property_reference->object; IDispatch *i_dispatch; int type; VARIANTARG var_result; @@ -748,7 +748,7 @@ zend_overloaded_element *overloaded_property; zend_llist_element *element; pval **idispatch_handle; - pval *object = *property_reference->object; + pval *object = property_reference->object; IDispatch *i_dispatch; int type; VARIANTARG var_result; @@ -810,7 +810,7 @@ void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference) { zend_overloaded_element *overloaded_property; - pval *object = *property_reference->object; + pval *object = property_reference->object; zend_overloaded_element *function_name = (zend_overloaded_element *) property_reference->elements_list.tail->data; if (zend_llist_count(&property_reference->elements_list)==1 Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.53 php4/ext/standard/basic_functions.c:1.54 --- php4/ext/standard/basic_functions.c:1.53 Sat Jul 24 18:16:54 1999 +++ php4/ext/standard/basic_functions.c Mon Jul 26 12:54:41 1999 @@ -94,7 +94,9 @@ #if HAVE_STRFTIME PHP_FE(strftime, NULL) #endif +#if !(WIN32|WINNT) PHP_FE(strtotime, NULL) +#endif PHP_FE(date, NULL) PHP_FE(gmdate, NULL) PHP_FE(getdate, NULL) Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.15 php4/ext/standard/datetime.c:1.16 --- php4/ext/standard/datetime.c:1.15 Fri Jul 23 22:43:22 1999 +++ php4/ext/standard/datetime.c Mon Jul 26 12:54:41 1999 @@ -19,7 +19,7 @@ */ -/* $Id: datetime.c,v 1.15 1999/07/24 02:43:22 rasmus Exp $ */ +/* $Id: datetime.c,v 1.16 1999/07/26 16:54:41 andi Exp $ */ #include "php.h" @@ -65,7 +65,9 @@ #define isleap(year) (((year%4) == 0 && (year%100)!=0) || (year%400)==0) +#if !(WIN32|WINNT) extern PHPAPI time_t parsedate(char *p, struct timeval *now); +#endif PHP_FUNCTION(time) { @@ -556,6 +558,7 @@ } #endif +#if !(WIN32|WINNT) /* {{{ proto int strtotime(string time, int now) */ PHP_FUNCTION(strtotime) { @@ -579,6 +582,7 @@ RETURN_LONG(parsedate(timep->value.str.val, NULL)); } } +#endif /* }}} */ /* Index: php4/tests/testobj diff -u php4/tests/testobj:1.1 php4/tests/testobj:1.2 --- php4/tests/testobj:1.1 Thu Jul 8 17:42:29 1999 +++ php4/tests/testobj Mon Jul 26 12:54:41 1999 @@ -8,6 +8,7 @@ }; $foo = new foobar; // or die("Unable to construct foobar\n"); +print $foo->initialized; //$word = new COm("word.application"); //$word->visible = true; //sleep(5);