[PHP-CVS] cvs: php-src /main php.h /win32/build config.w32.h.in

2008-11-22 Thread Scott MacVicar 
scottmacSat Nov 22 15:16:42 2008 UTC

  Modified files:  
/php-src/win32/buildconfig.w32.h.in 
/php-src/main   php.h 
  Log:
  Better fix for va_copy since some architectures like to do a deep copy.
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.19r2=1.20diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.19 
php-src/win32/build/config.w32.h.in:1.20
--- php-src/win32/build/config.w32.h.in:1.19Sat Nov 22 13:39:04 2008
+++ php-src/win32/build/config.w32.h.in Sat Nov 22 15:16:42 2008
@@ -1,6 +1,6 @@
 /*
Build Configuration Template for Win32.
-   $Id: config.w32.h.in,v 1.19 2008/11/22 13:39:04 pajoye Exp $
+   $Id: config.w32.h.in,v 1.20 2008/11/22 15:16:42 scottmac Exp $
 */
 
 /* Define the minimum supported version */
@@ -158,5 +158,3 @@
 # define _USE_32BIT_TIME_T 1
 #endif
 #define HAVE_STDLIB_H 1
-
-#define va_copy(ap1, ap2) memcpy((ap1), (ap2), sizeof(va_list))
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.249r2=1.250diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.249 php-src/main/php.h:1.250
--- php-src/main/php.h:1.249Fri Aug 22 12:59:38 2008
+++ php-src/main/php.h  Sat Nov 22 15:16:42 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.249 2008/08/22 12:59:38 helly Exp $ */
+/* $Id: php.h,v 1.250 2008/11/22 15:16:42 scottmac Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -173,6 +173,14 @@
 # endif
 #endif
 
+#ifndef va_copy
+# ifdef __va_copy
+#  define va_copy(ap1, ap2) __va_copy((ap1), (ap2))
+# else
+#  define va_copy(ap1, ap2) memcpy((ap1), (ap2), sizeof(va_list))
+# endif
+#endif
+
 #include zend_hash.h
 #include zend_alloc.h
 #include zend_stack.h



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h /win32 time.c

2008-08-13 Thread Kalle Sommer Nielsen 
kalle   Wed Aug 13 22:39:33 2008 UTC

  Modified files:  
/php-src/main   php.h 
/php-src/win32  time.c 
  Log:
  * Remove NTDDI_VERSION declaring and use the one in config.w32.h
  * Remove another _WIN32_WINNT macro redef in win32/time.c
  
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.247r2=1.248diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.247 php-src/main/php.h:1.248
--- php-src/main/php.h:1.247Fri Aug  8 17:10:49 2008
+++ php-src/main/php.h  Wed Aug 13 22:39:33 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.247 2008/08/08 17:10:49 helly Exp $ */
+/* $Id: php.h,v 1.248 2008/08/13 22:39:33 kalle Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -54,12 +54,6 @@
 #  endif
 #  define PHP_DIR_SEPARATOR '\\'
 #  define PHP_EOL \r\n
-#  if defined(NTDDI_VERSION)  NTDDI_VERSION = 0x0600
-#  undef NTDDI_VERSION
-#  endif
-#  ifndef NTDDI_VERSION
-#  define NTDDI_VERSION 0x0500
-#  endif
 #else
 #  if defined(__GNUC__)  __GNUC__ = 4
 #  define PHPAPI __attribute__ ((visibility(default)))
http://cvs.php.net/viewvc.cgi/php-src/win32/time.c?r1=1.10r2=1.11diff_format=u
Index: php-src/win32/time.c
diff -u php-src/win32/time.c:1.10 php-src/win32/time.c:1.11
--- php-src/win32/time.c:1.10   Thu Jul 29 02:59:43 2004
+++ php-src/win32/time.cWed Aug 13 22:39:33 2008
@@ -11,7 +11,7 @@
  *
  */
 
-/* $Id: time.c,v 1.10 2004/07/29 02:59:43 wez Exp $ */
+/* $Id: time.c,v 1.11 2008/08/13 22:39:33 kalle Exp $ */
 
  /**
   *
@@ -22,10 +22,6 @@
 
 /* Include stuff  
*/
 
-/* this allows the use of the WaitableTimer functions.
- * For win98 and later */
-#define _WIN32_WINNT 0x400
-
 #include time.h
 #include unistd.h
 #include signal.h



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h ZendEngine2 zend_execute_API.c

2008-08-08 Thread Marcus Boerger 
helly   Fri Aug  8 13:18:31 2008 UTC

  Modified files:  
/ZendEngine2zend_execute_API.c 
/php-src/main   php.h 
  Log:
  - PHP 5.3 todo, store error handling mode on stack when executing internal
or overloaded functions and methods. The issue is that a function might
set and rely on a certain mode and then calls another internal function
which changes it again, probably changing it back to the normal mode.
With this change we need to drop all calls that change the mode back to
normal using php_std_error_handling(). However there might be places
where someone wants to restore the last mode. If there is such a case we
need to add two functions one to save and one to restore. I briefly on
this and not all cases are clear, especially one in sqlite but that seems
to be a rather misleading comment. Eitherway I chose to not drop and mark
as deprecated for now.
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.456r2=1.457diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.456 
ZendEngine2/zend_execute_API.c:1.457
--- ZendEngine2/zend_execute_API.c:1.456Fri Aug  1 14:21:45 2008
+++ ZendEngine2/zend_execute_API.c  Fri Aug  8 13:18:30 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_execute_API.c,v 1.456 2008/08/01 14:21:45 dmitry Exp $ */
+/* $Id: zend_execute_API.c,v 1.457 2008/08/08 13:18:30 helly Exp $ */
 
 #include stdio.h
 #include signal.h
@@ -947,12 +947,16 @@
EG(opline_ptr) = original_opline_ptr;
} else if (EX(function_state).function-type == ZEND_INTERNAL_FUNCTION) 
{
int call_via_handler = 
(EX(function_state).function-common.fn_flags  ZEND_ACC_CALL_VIA_HANDLER) != 0;
+   zend_error_handling_t  error_handling  = EG(error_handling);
+   zend_class_entry  *exception_class = EG(exception_class);
 
ALLOC_INIT_ZVAL(*fci-retval_ptr_ptr);
if (EX(function_state).function-common.scope) {
EG(scope) = EX(function_state).function-common.scope;
}
((zend_internal_function *) 
EX(function_state).function)-handler(fci-param_count, *fci-retval_ptr_ptr, 
fci-retval_ptr_ptr, (fci-object_pp?*fci-object_pp:NULL), 1 TSRMLS_CC);
+   EG(error_handling)  = error_handling;
+   EG(exception_class) = exception_class;
/*  We shouldn't fix bad extensions here,
because it can break proper ones (Bug #34045)
if (!EX(function_state).function-common.return_reference)
@@ -969,12 +973,15 @@
fci_cache-initialized = 0;
}
} else { /* ZEND_OVERLOADED_FUNCTION */
-
ALLOC_INIT_ZVAL(*fci-retval_ptr_ptr);
 
/* Not sure what should be done here if it's a static 
method */
if (fci-object_pp) {
+   zend_error_handling_t  error_handling  = 
EG(error_handling);
+   zend_class_entry  *exception_class = 
EG(exception_class);

Z_OBJ_HT_PP(fci-object_pp)-call_method(EX(function_state).function-common.function_name,
 fci-param_count, *fci-retval_ptr_ptr, fci-retval_ptr_ptr, *fci-object_pp, 
1 TSRMLS_CC);
+   EG(error_handling)  = error_handling;
+   EG(exception_class) = exception_class;
} else {
zend_error_noreturn(E_ERROR, Cannot call overloaded 
function for non-object);
}
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.244r2=1.245diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.244 php-src/main/php.h:1.245
--- php-src/main/php.h:1.244Tue Jun 24 05:59:11 2008
+++ php-src/main/php.h  Fri Aug  8 13:18:31 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.244 2008/06/24 05:59:11 kalle Exp $ */
+/* $Id: php.h,v 1.245 2008/08/08 13:18:31 helly Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -287,7 +287,7 @@
 
 BEGIN_EXTERN_C()
 PHPAPI void php_set_error_handling(error_handling_t error_handling, 
zend_class_entry *exception_class TSRMLS_DC);
-#define php_std_error_handling() php_set_error_handling(EH_NORMAL, NULL 
TSRMLS_CC)
+static ZEND_ATTRIBUTE_DEPRECATED void php_std_error_handling() {}
 
 PHPAPI void php_verror(const char *docref, const char *params, int type, const 
char *format, va_list args TSRMLS_DC);
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2008-08-08 Thread Marcus Boerger 
helly   Fri Aug  8 14:14:52 2008 UTC

  Modified files:  
/php-src/main   php.h 
  Log:
  - Sorry for the compiler warning
  
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.245r2=1.246diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.245 php-src/main/php.h:1.246
--- php-src/main/php.h:1.245Fri Aug  8 13:18:31 2008
+++ php-src/main/php.h  Fri Aug  8 14:14:52 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.245 2008/08/08 13:18:31 helly Exp $ */
+/* $Id: php.h,v 1.246 2008/08/08 14:14:52 helly Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -287,7 +287,7 @@
 
 BEGIN_EXTERN_C()
 PHPAPI void php_set_error_handling(error_handling_t error_handling, 
zend_class_entry *exception_class TSRMLS_DC);
-static ZEND_ATTRIBUTE_DEPRECATED void php_std_error_handling() {}
+static inline ZEND_ATTRIBUTE_DEPRECATED void php_std_error_handling() {}
 
 PHPAPI void php_verror(const char *docref, const char *params, int type, const 
char *format, va_list args TSRMLS_DC);
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2008-06-23 Thread Kalle Sommer Nielsen 
kalle   Tue Jun 24 05:59:11 2008 UTC

  Modified files:  
/php-src/main   php.h 
  Log:
  Fix build on Windows NT6
  
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.243r2=1.244diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.243 php-src/main/php.h:1.244
--- php-src/main/php.h:1.243Sat Mar  8 22:17:32 2008
+++ php-src/main/php.h  Tue Jun 24 05:59:11 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.243 2008/03/08 22:17:32 colder Exp $ */
+/* $Id: php.h,v 1.244 2008/06/24 05:59:11 kalle Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -54,6 +54,12 @@
 #  endif
 #  define PHP_DIR_SEPARATOR '\\'
 #  define PHP_EOL \r\n
+#  if defined(NTDDI_VERSION)  NTDDI_VERSION = 0x0600
+#  undef NTDDI_VERSION
+#  endif
+#  ifndef NTDDI_VERSION
+#  define NTDDI_VERSION 0x0500
+#  endif
 #else
 #  if defined(__GNUC__)  __GNUC__ = 4
 #  define PHPAPI __attribute__ ((visibility(default)))



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h php_ini.h

2007-08-31 Thread Jani Taskinen 
janiFri Aug 31 07:47:41 2007 UTC

  Modified files:  
/php-src/main   php.h php_ini.h 
  Log:
  - Moved the php.ini related function protos where they belong
  
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.239r2=1.240diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.239 php-src/main/php.h:1.240
--- php-src/main/php.h:1.239Sun Jul 15 19:50:06 2007
+++ php-src/main/php.h  Fri Aug 31 07:47:41 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.239 2007/07/15 19:50:06 jani Exp $ */
+/* $Id: php.h,v 1.240 2007/08/31 07:47:41 jani Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -316,10 +316,6 @@
 
 PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void 
*userdata);
 
-PHPAPI int cfg_get_long(char *varname, long *result);
-PHPAPI int cfg_get_double(char *varname, double *result);
-PHPAPI int cfg_get_string(char *varname, char **result);
-
 PHPAPI void php_com_initialize(TSRMLS_D);
 END_EXTERN_C()
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.h?r1=1.50r2=1.51diff_format=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.50 php-src/main/php_ini.h:1.51
--- php-src/main/php_ini.h:1.50 Fri Aug  3 01:40:05 2007
+++ php-src/main/php_ini.h  Fri Aug 31 07:47:41 2007
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_ini.h,v 1.50 2007/08/03 01:40:05 stas Exp $ */
+/* $Id: php_ini.h,v 1.51 2007/08/31 07:47:41 jani Exp $ */
 
 #ifndef PHP_INI_H
 #define PHP_INI_H
@@ -27,7 +27,10 @@
 int php_init_config(TSRMLS_D);
 int php_shutdown_config(void);
 void php_ini_register_extensions(TSRMLS_D);
-zval *cfg_get_entry(char *name, uint name_length);
+PHPAPI zval *cfg_get_entry(char *name, uint name_length);
+PHPAPI int cfg_get_long(char *varname, long *result);
+PHPAPI int cfg_get_double(char *varname, double *result);
+PHPAPI int cfg_get_string(char *varname, char **result);
 END_EXTERN_C()
 
 #define PHP_INI_USER   ZEND_INI_USER

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2007-01-16 Thread Andrei Zmievski 
andrei  Tue Jan 16 22:18:39 2007 UTC

  Modified files:  
/php-src/main   php.h 
  Log:
  Update PHP API version.
  
  # Wonder why it hasn't been done already.
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.237r2=1.238diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.237 php-src/main/php.h:1.238
--- php-src/main/php.h:1.237Mon Jan  1 09:29:35 2007
+++ php-src/main/php.h  Tue Jan 16 22:18:39 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.237 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: php.h,v 1.238 2007/01/16 22:18:39 andrei Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -26,7 +26,7 @@
 #include dmalloc.h
 #endif
 
-#define PHP_API_VERSION 20050809
+#define PHP_API_VERSION 20070116
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2006-05-25 Thread Edin Kadribasic 
edink   Thu May 25 18:48:31 2006 UTC

  Modified files:  
/php-src/main   php.h 
  Log:
  MFB: Missing definition, patch by Steph Fox
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.229r2=1.230diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.229 php-src/main/php.h:1.230
--- php-src/main/php.h:1.229Wed Mar  8 14:41:45 2006
+++ php-src/main/php.h  Thu May 25 18:48:30 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.229 2006/03/08 14:41:45 iliaa Exp $ */
+/* $Id: php.h,v 1.230 2006/05/25 18:48:30 edink Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -330,6 +330,7 @@
 
 /* PHP-named Zend macro wrappers */
 #define PHP_FN ZEND_FN
+#define PHP_MN ZEND_MN
 #define PHP_NAMED_FUNCTION ZEND_NAMED_FUNCTION
 #define PHP_FUNCTION   ZEND_FUNCTION
 #define PHP_METHOD ZEND_METHOD

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h /sapi/cgi cgi_main.c

2006-03-07 Thread Alex Waugh 
alexwaugh   Tue Mar  7 22:37:19 2006 UTC

  Modified files:  
/php-src/main   php.h 
/php-src/sapi/cgi   cgi_main.c 
  Log:
  Fix for RISC OS
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.227r2=1.228diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.227 php-src/main/php.h:1.228
--- php-src/main/php.h:1.227Fri Feb 24 13:30:21 2006
+++ php-src/main/php.h  Tue Mar  7 22:37:18 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.227 2006/02/24 13:30:21 helly Exp $ */
+/* $Id: php.h,v 1.228 2006/03/07 22:37:18 alexwaugh Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -415,7 +415,7 @@
  */
 
 #ifndef XtOffset
-#if defined(CRAY) || (defined(__arm)  !defined(LINUX))
+#if defined(CRAY) || (defined(__arm)  !(defined(LINUX) || 
defined(__riscos__)))
 #ifdef __STDC__
 #define XtOffset(p_type, field) _Offsetof(p_type, field)
 #else
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.276r2=1.277diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.276 php-src/sapi/cgi/cgi_main.c:1.277
--- php-src/sapi/cgi/cgi_main.c:1.276   Mon Feb 13 10:23:58 2006
+++ php-src/sapi/cgi/cgi_main.c Tue Mar  7 22:37:18 2006
@@ -20,7 +20,7 @@
+--+
 */
 
-/* $Id: cgi_main.c,v 1.276 2006/02/13 10:23:58 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.277 2006/03/07 22:37:18 alexwaugh Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -69,6 +69,7 @@
 
 #ifdef __riscos__
 #include unixlib/local.h
+int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
 #endif
 
 #include zend_compile.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2006-02-24 Thread Marcus Boerger 
helly   Fri Feb 24 13:30:21 2006 UTC

  Modified files:  
/php-src/main   php.h 
  Log:
  - Add deprecation function/function alias macros
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.226r2=1.227diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.226 php-src/main/php.h:1.227
--- php-src/main/php.h:1.226Sun Jan  1 13:09:57 2006
+++ php-src/main/php.h  Fri Feb 24 13:30:21 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.226 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: php.h,v 1.227 2006/02/24 13:30:21 helly Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -338,7 +338,9 @@
 
 #define PHP_NAMED_FE   ZEND_NAMED_FE
 #define PHP_FE ZEND_FE
+#define PHP_DEP_FE  ZEND_DEP_FE
 #define PHP_FALIAS ZEND_FALIAS
+#define PHP_DEP_FALIAS ZEND_DEP_FALIAS
 #define PHP_ME  ZEND_ME
 #define PHP_MALIAS  ZEND_MALIAS
 #define PHP_ABSTRACT_ME ZEND_ABSTRACT_ME

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2005-12-20 Thread Ilia Alshanetsky 
iliaa   Tue Dec 20 14:27:04 2005 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  MFB51: Fixed bug #31347 (is_dir and is_file (incorrectly) return true for any
  string greater then 255 characters).
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.224r2=1.225diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.224 php-src/main/php.h:1.225
--- php-src/main/php.h:1.224Tue Dec  6 00:44:21 2005
+++ php-src/main/php.h  Tue Dec 20 14:27:04 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.224 2005/12/06 00:44:21 sniper Exp $ */
+/* $Id: php.h,v 1.225 2005/12/20 14:27:04 iliaa Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -248,6 +248,8 @@
 #ifndef MAXPATHLEN
 # ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX
+# elif defined(MAX_PATH)
+#  define MAXPATHLEN MAX_PATH
 # else
 #  define MAXPATHLEN 256/* Should be safe for any weird systems that do 
not define it */
 # endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2005-08-07 Thread Hartmut Holzgraefe 
hholzgraSun Aug  7 11:13:51 2005 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  typo fix
  
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.220r2=1.221ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.220 php-src/main/php.h:1.221
--- php-src/main/php.h:1.220Wed Aug  3 10:08:33 2005
+++ php-src/main/php.h  Sun Aug  7 11:13:50 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.220 2005/08/03 14:08:33 sniper Exp $ */
+/* $Id: php.h,v 1.221 2005/08/07 15:13:50 hholzgra Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -341,7 +341,7 @@
 #define PHP_FALIAS ZEND_FALIAS
 #define PHP_ME  ZEND_ME
 #define PHP_MALIAS  ZEND_MALIAS
-#define PHP_ASTSRACT_ME ZEND_ABSTRACT_ME
+#define PHP_ABSTRACT_ME ZEND_ABSTRACT_ME
 #define PHP_ME_MAPPING  ZEND_ME_MAPPING
 
 #define PHP_MODULE_STARTUP_N   ZEND_MODULE_STARTUP_N

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2005-04-17 Thread Jani Taskinen 
sniper  Sun Apr 17 09:37:21 2005 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  - Remove relic
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.217r2=1.218ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.217 php-src/main/php.h:1.218
--- php-src/main/php.h:1.217Fri Mar 25 20:29:43 2005
+++ php-src/main/php.h  Sun Apr 17 09:37:20 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.217 2005/03/26 01:29:43 sniper Exp $ */
+/* $Id: php.h,v 1.218 2005/04/17 13:37:20 sniper Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -253,7 +253,6 @@
 
 
 /* global variables */
-extern pval *data;
 #if !defined(PHP_WIN32)
 #define PHP_SLEEP_NON_VOID
 #define php_sleep sleep

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /main php.h

2005-03-25 Thread Jani Taskinen 
On Thu, 24 Mar 2005, Andrei Zmievski wrote:
On Mon, 21 Mar 2005, Jani Taskinen wrote:
On Mon, 21 Mar 2005, Andrei Zmievski wrote:
andrei  Mon Mar 21 01:43:28 2005 EDT
Modified files:
  /php-src/main php.h
Log:
Define PHP_ABSTRACT_ME
Why? Why not use the ZEND macros?
Well, why do we have existing PHP_* ones anyway?
Yeah, why?
--Jani
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2005-03-25 Thread Jani Taskinen 
sniper  Fri Mar 25 20:29:44 2005 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  Fix path
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.216r2=1.217ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.216 php-src/main/php.h:1.217
--- php-src/main/php.h:1.216Mon Mar 21 01:43:28 2005
+++ php-src/main/php.h  Fri Mar 25 20:29:43 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.216 2005/03/21 06:43:28 andrei Exp $ */
+/* $Id: php.h,v 1.217 2005/03/26 01:29:43 sniper Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -398,7 +398,7 @@
 
 
 /* Virtual current working directory support */
-#include ../TSRM/tsrm_virtual_cwd.h
+#include tsrm_virtual_cwd.h
 
 #include zend_constants.h
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /main php.h

2005-03-24 Thread Andrei Zmievski 
On Mon, 21 Mar 2005, Jani Taskinen wrote:
 On Mon, 21 Mar 2005, Andrei Zmievski wrote:
 
 andrei   Mon Mar 21 01:43:28 2005 EDT
 
  Modified files:
/php-src/main php.h
  Log:
  Define PHP_ABSTRACT_ME
 
 Why? Why not use the ZEND macros?

Well, why do we have existing PHP_* ones anyway?

- Andrei

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2005-03-20 Thread Andrei Zmievski 
andrei  Mon Mar 21 01:43:28 2005 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  Define PHP_ABSTRACT_ME
  
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.215r2=1.216ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.215 php-src/main/php.h:1.216
--- php-src/main/php.h:1.215Wed Mar 16 17:00:03 2005
+++ php-src/main/php.h  Mon Mar 21 01:43:28 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.215 2005/03/16 22:00:03 rasmus Exp $ */
+/* $Id: php.h,v 1.216 2005/03/21 06:43:28 andrei Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -342,6 +342,7 @@
 #define PHP_FALIAS ZEND_FALIAS
 #define PHP_ME  ZEND_ME
 #define PHP_MALIAS  ZEND_MALIAS
+#define PHP_ASTSRACT_ME ZEND_ABSTRACT_ME
 #define PHP_ME_MAPPING  ZEND_ME_MAPPING
 
 #define PHP_MODULE_STARTUP_N   ZEND_MODULE_STARTUP_N

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /main php.h

2005-03-20 Thread Jani Taskinen 
On Mon, 21 Mar 2005, Andrei Zmievski wrote:
andrei  Mon Mar 21 01:43:28 2005 EDT
 Modified files:
   /php-src/mainphp.h
 Log:
 Define PHP_ABSTRACT_ME
Why? Why not use the ZEND macros?
--Jani

http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.215r2=1.216ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.215 php-src/main/php.h:1.216
--- php-src/main/php.h:1.215Wed Mar 16 17:00:03 2005
+++ php-src/main/php.h  Mon Mar 21 01:43:28 2005
@@ -17,7 +17,7 @@
   +--+
 */
-/* $Id: php.h,v 1.215 2005/03/16 22:00:03 rasmus Exp $ */
+/* $Id: php.h,v 1.216 2005/03/21 06:43:28 andrei Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -342,6 +342,7 @@
#define PHP_FALIAS  ZEND_FALIAS
#define PHP_ME  ZEND_ME
#define PHP_MALIAS  ZEND_MALIAS
+#define PHP_ASTSRACT_ME ZEND_ABSTRACT_ME
#define PHP_ME_MAPPING  ZEND_ME_MAPPING
#define PHP_MODULE_STARTUP_NZEND_MODULE_STARTUP_N
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2005-03-08 Thread Jani Taskinen 
sniper  Tue Mar  8 16:22:03 2005 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  - This was not needed (said Marcus)
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.212r2=1.213ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.212 php-src/main/php.h:1.213
--- php-src/main/php.h:1.212Mon Feb 14 06:10:07 2005
+++ php-src/main/php.h  Tue Mar  8 16:22:03 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.212 2005/02/14 11:10:07 hyanantha Exp $ */
+/* $Id: php.h,v 1.213 2005/03/08 21:22:03 sniper Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -299,7 +299,7 @@
 #endif
 
 /* PHPAPI void php_error(int type, const char *format, ...); */
-PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const 
char *format, ...)
+PHPAPI void php_error_docref(const char *docref TSRMLS_DC, int type, const 
char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 3, 
PHP_ATTR_FMT_OFFSET + 4);
 PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char 
*param1, int type, const char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, 
PHP_ATTR_FMT_OFFSET + 5);
@@ -307,8 +307,6 @@
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, 
PHP_ATTR_FMT_OFFSET + 6);
 END_EXTERN_C()
 
-#define php_error_docref php_error_docref0
-
 #define zenderror phperror
 #define zendlex phplex
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2005-02-14 Thread Anantha Kesari H Y 
hyanantha   Mon Feb 14 06:10:11 2005 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  NetWare Libc has php.h so no need of having netware specific block here
  
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.211r2=1.212ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.211 php-src/main/php.h:1.212
--- php-src/main/php.h:1.211Fri Jan 14 15:44:28 2005
+++ php-src/main/php.h  Mon Feb 14 06:10:07 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.211 2005/01/14 20:44:28 sniper Exp $ */
+/* $Id: php.h,v 1.212 2005/02/14 11:10:07 hyanantha Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -201,9 +201,6 @@
 # ifdef PHP_WIN32
 #include win32/pwd.h
 #include win32/param.h
-#elif defined(NETWARE)
-#include sys/param.h
-#include NetWare/pwd.h
 # else
 #include pwd.h
 #include sys/param.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h /sapi/apache_hooks php_apache.c

2005-01-14 Thread Jani Taskinen 
sniper  Fri Jan 14 15:44:28 2005 EDT

  Modified files:  
/php-src/sapi/apache_hooks  php_apache.c 
/php-src/main   php.h 
  Log:
  - Fix another generated header include
  
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/php_apache.c?r1=1.17r2=1.18ty=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.17 
php-src/sapi/apache_hooks/php_apache.c:1.18
--- php-src/sapi/apache_hooks/php_apache.c:1.17 Sun May 30 13:53:12 2004
+++ php-src/sapi/apache_hooks/php_apache.c  Fri Jan 14 15:44:28 2005
@@ -17,7 +17,7 @@
|  David Sklar [EMAIL PROTECTED] |
+--+
  */
-/* $Id: php_apache.c,v 1.17 2004/05/30 17:53:12 zeev Exp $ */
+/* $Id: php_apache.c,v 1.18 2005/01/14 20:44:28 sniper Exp $ */
 
 #include php_apache_http.h
 
@@ -25,7 +25,7 @@
 #include zend.h
 #include ap_compat.h
 #else
-#include build-defs.h
+#include build-defs.h
 #endif
 
 #ifdef ZTS
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.210r2=1.211ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.210 php-src/main/php.h:1.211
--- php-src/main/php.h:1.210Sat Dec 25 23:46:09 2004
+++ php-src/main/php.h  Fri Jan 14 15:44:28 2005
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.210 2004/12/26 04:46:09 wez Exp $ */
+/* $Id: php.h,v 1.211 2005/01/14 20:44:28 sniper Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -97,7 +97,7 @@
 #endif
 
 #if HAVE_BUILD_DEFS_H
-#include build-defs.h
+#include build-defs.h
 #endif
 
 /*

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2004-12-25 Thread Wez Furlong 
wez Sat Dec 25 23:46:09 2004 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  bump PHP API number.
  
  This is so that we can work around the signature change in the get_method
  overloaded object handler in our portable extensions.
  
  Yes, you could argue that the zend api number needs bumping, but then you 
could
  argue which one to bump, as neither of them is specific or generic enough.
  
  Besides all that, the PHP API number really needs a good old bump anyway.
  
  
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.209r2=1.210ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.209 php-src/main/php.h:1.210
--- php-src/main/php.h:1.209Sun Nov 28 07:44:28 2004
+++ php-src/main/php.h  Sat Dec 25 23:46:09 2004
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.209 2004/11/28 12:44:28 sesser Exp $ */
+/* $Id: php.h,v 1.210 2004/12/26 04:46:09 wez Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -26,7 +26,7 @@
 #include dmalloc.h
 #endif
 
-#define PHP_API_VERSION 20031224
+#define PHP_API_VERSION 20041225
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2004-09-30 Thread Marcus Boerger 
helly   Thu Sep 30 04:03:41 2004 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  -  Add missing macro
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.204r2=1.205ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.204 php-src/main/php.h:1.205
--- php-src/main/php.h:1.204Wed Sep 29 10:42:16 2004
+++ php-src/main/php.h  Thu Sep 30 04:03:38 2004
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.204 2004/09/29 14:42:16 hyanantha Exp $ */
+/* $Id: php.h,v 1.205 2004/09/30 08:03:38 helly Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -337,6 +337,7 @@
 #define PHP_FE ZEND_FE
 #define PHP_FALIAS ZEND_FALIAS
 #define PHP_ME  ZEND_ME
+#define PHP_MALIAS  ZEND_MALIAS
 #define PHP_ME_MAPPING  ZEND_ME_MAPPING
 
 #define PHP_MODULE_STARTUP_N   ZEND_MODULE_STARTUP_N

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2004-09-29 Thread Anantha Kesari H Y 
hyanantha   Wed Sep 29 10:42:16 2004 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  removed unwanted NEW_LIBC checks
  
  
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.203r2=1.204ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.203 php-src/main/php.h:1.204
--- php-src/main/php.h:1.203Sun Jan 11 19:19:40 2004
+++ php-src/main/php.h  Wed Sep 29 10:42:16 2004
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.203 2004/01/12 00:19:40 helly Exp $ */
+/* $Id: php.h,v 1.204 2004/09/29 14:42:16 hyanantha Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -70,10 +70,6 @@
 #ifdef NETWARE
 /* For php_get_uname() function */
 #define PHP_UNAME  NetWare
-/*
- * This is obtained using uname(2) on Unix and assigned in the case of Windows;
- * we'll do it this way at least for now.
- */
 #define PHP_OS  PHP_UNAME
 #endif
 
@@ -208,11 +204,7 @@
 #include win32/pwd.h
 #include win32/param.h
 #elif defined(NETWARE)
-#ifdef NEW_LIBC
 #include sys/param.h
-#else
-#include NetWare/param.h
-#endif
 #include NetWare/pwd.h
 # else
 #include pwd.h
@@ -260,18 +252,8 @@
 /* global variables */
 extern pval *data;
 #if !defined(PHP_WIN32)
-#ifdef NETWARE
-#ifdef NEW_LIBC
 #define php_sleep sleep
-#else  /* NEW_LIBC */
-#define php_sleep   delay   /* sleep() and usleep() are not available */
-#define usleep  delay
-#endif /* NEW_LIBC */
-extern char **environ;
-#else  /* NETWARE */
 extern char **environ;
-#define php_sleep sleep
-#endif /*  NETWARE */
 #endif /* !defined(PHP_WIN32) */
 
 #ifdef PHP_PWRITE_64

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2004-01-11 Thread Marcus Boerger 
helly   Sun Jan 11 19:19:41 2004 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  Add missing macro
  # by popular demand, more and more exts need this
  
  
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.202 php-src/main/php.h:1.203
--- php-src/main/php.h:1.202Thu Jan  8 12:33:04 2004
+++ php-src/main/php.h  Sun Jan 11 19:19:40 2004
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.202 2004/01/08 17:33:04 sniper Exp $ */
+/* $Id: php.h,v 1.203 2004/01/12 00:19:40 helly Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -355,6 +355,7 @@
 #define PHP_FE ZEND_FE
 #define PHP_FALIAS ZEND_FALIAS
 #define PHP_ME  ZEND_ME
+#define PHP_ME_MAPPING  ZEND_ME_MAPPING
 
 #define PHP_MODULE_STARTUP_N   ZEND_MODULE_STARTUP_N
 #define PHP_MODULE_SHUTDOWN_N  ZEND_MODULE_SHUTDOWN_N

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2003-09-02 Thread Ard Biesheuvel 
abies   Tue Sep  2 09:05:16 2003 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  Fix use of EXTERN_C macros
  
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.197 php-src/main/php.h:1.198
--- php-src/main/php.h:1.197Thu Aug 28 20:22:36 2003
+++ php-src/main/php.h  Tue Sep  2 09:05:15 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.197 2003/08/29 00:22:36 helly Exp $ */
+/* $Id: php.h,v 1.198 2003/09/02 13:05:15 abies Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -122,25 +122,25 @@
}
 
 #ifndef HAVE_STRLCPY
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 PHPAPI size_t php_strlcpy(char *dst, const char *src, size_t siz);
-END_EXTERN_C();
+END_EXTERN_C()
 #undef strlcpy
 #define strlcpy php_strlcpy
 #endif
 
 #ifndef HAVE_STRLCAT
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 PHPAPI size_t php_strlcat(char *dst, const char *src, size_t siz);
-END_EXTERN_C();
+END_EXTERN_C()
 #undef strlcat
 #define strlcat php_strlcat
 #endif
 
 #ifndef HAVE_STRTOK_R
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 char *strtok_r(char *s, const char *delim, char **last);
-END_EXTERN_C();
+END_EXTERN_C()
 #endif
 
 #ifndef HAVE_SOCKLEN_T
@@ -276,7 +276,7 @@
 ssize_t pread(int, void *, size_t, off64_t);
 #endif
 
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 void phperror(char *error);
 PHPAPI int php_write(void *buf, uint size TSRMLS_DC);
 PHPAPI int php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1,
@@ -284,7 +284,7 @@
 PHPAPI void php_log_err(char *log_message TSRMLS_DC);
 int Debug(char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2);
 int cfgparse(void);
-END_EXTERN_C();
+END_EXTERN_C()
 
 #define php_error zend_error
 
@@ -294,7 +294,7 @@
EH_THROW
 } error_handling_t;
 
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 PHPAPI void php_set_error_handling(error_handling_t error_handling, zend_class_entry 
*exception_class TSRMLS_DC);
 #define php_std_error_handling() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC)
 
@@ -313,7 +313,7 @@
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5);
 PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const 
char *param2, int type, const char *format, ...)
PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6);
-END_EXTERN_C();
+END_EXTERN_C()
 
 #define php_error_docref php_error_docref0
 
@@ -327,7 +327,7 @@
 #define php_memnstr zend_memnstr
 
 /* functions */
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 int php_startup_internal_extensions(void);
 
 int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const 
void *, const void * TSRMLS_DC) TSRMLS_DC);
@@ -337,7 +337,7 @@
 PHPAPI int cfg_get_long(char *varname, long *result);
 PHPAPI int cfg_get_double(char *varname, double *result);
 PHPAPI int cfg_get_string(char *varname, char **result);
-END_EXTERN_C();
+END_EXTERN_C()
 
 /* PHP-named Zend macro wrappers */
 #define PHP_FN ZEND_FN

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2003-08-29 Thread Marcus Boerger 
helly   Thu Aug 28 20:22:37 2003 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  Add define to reset error handling more easily
  
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.196 php-src/main/php.h:1.197
--- php-src/main/php.h:1.196Thu Aug 28 12:49:43 2003
+++ php-src/main/php.h  Thu Aug 28 20:22:36 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.196 2003/08/28 16:49:43 sas Exp $ */
+/* $Id: php.h,v 1.197 2003/08/29 00:22:36 helly Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -296,6 +296,7 @@
 
 BEGIN_EXTERN_C();
 PHPAPI void php_set_error_handling(error_handling_t error_handling, zend_class_entry 
*exception_class TSRMLS_DC);
+#define php_std_error_handling() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC)
 
 PHPAPI void php_verror(const char *docref, const char *params, int type, const char 
*format, va_list args TSRMLS_DC) PHP_ATTRIBUTE_FORMAT(printf, 4, 0);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2003-08-28 Thread Sascha Schumann 
sas Thu Aug 28 10:53:37 2003 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  Use ZEND_GCC_VERSION and ZEND_ATTRIBUTE_MALLOC
  
  
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.194 php-src/main/php.h:1.195
--- php-src/main/php.h:1.194Thu Aug 28 01:23:08 2003
+++ php-src/main/php.h  Thu Aug 28 10:53:36 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.194 2003/08/28 05:23:08 sas Exp $ */
+/* $Id: php.h,v 1.195 2003/08/28 14:53:36 sas Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -226,7 +226,10 @@
 #define LONG_MIN (- LONG_MAX - 1)
 #endif
 
-#ifdef __GNUC__
+#define PHP_GCC_VERSION ZEND_GCC_VERSION
+#define PHP_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_MALLOC
+
+#if PHP_GCC_VERSION = 2007
 # define PHP_ATTRIBUTE_FORMAT(type, idx, first) __attribute__ ((format(type, idx, 
first)))
 #else
 # define PHP_ATTRIBUTE_FORMAT(type, idx, first)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2003-08-28 Thread Sascha Schumann 
sas Thu Aug 28 12:49:43 2003 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  add format attribute where appropiate
  
  
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.195 php-src/main/php.h:1.196
--- php-src/main/php.h:1.195Thu Aug 28 10:53:36 2003
+++ php-src/main/php.h  Thu Aug 28 12:49:43 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.195 2003/08/28 14:53:36 sas Exp $ */
+/* $Id: php.h,v 1.196 2003/08/28 16:49:43 sas Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -228,12 +228,7 @@
 
 #define PHP_GCC_VERSION ZEND_GCC_VERSION
 #define PHP_ATTRIBUTE_MALLOC ZEND_ATTRIBUTE_MALLOC
-
-#if PHP_GCC_VERSION = 2007
-# define PHP_ATTRIBUTE_FORMAT(type, idx, first) __attribute__ ((format(type, idx, 
first)))
-#else
-# define PHP_ATTRIBUTE_FORMAT(type, idx, first)
-#endif
+#define PHP_ATTRIBUTE_FORMAT ZEND_ATTRIBUTE_FORMAT
 
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) || PHP_BROKEN_SPRINTF || 
PHP_BROKEN_SNPRINTF || PHP_BROKEN_VSNPRINTF
 #include snprintf.h
@@ -284,9 +279,10 @@
 BEGIN_EXTERN_C();
 void phperror(char *error);
 PHPAPI int php_write(void *buf, uint size TSRMLS_DC);
-PHPAPI int php_printf(const char *format, ...);
+PHPAPI int php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1,
+   2);
 PHPAPI void php_log_err(char *log_message TSRMLS_DC);
-int Debug(char *format, ...);
+int Debug(char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2);
 int cfgparse(void);
 END_EXTERN_C();
 
@@ -301,12 +297,21 @@
 BEGIN_EXTERN_C();
 PHPAPI void php_set_error_handling(error_handling_t error_handling, zend_class_entry 
*exception_class TSRMLS_DC);
 
-PHPAPI void php_verror(const char *docref, const char *params, int type, const char 
*format, va_list args TSRMLS_DC) ;
+PHPAPI void php_verror(const char *docref, const char *params, int type, const char 
*format, va_list args TSRMLS_DC) PHP_ATTRIBUTE_FORMAT(printf, 4, 0);
+
+#ifdef ZTS
+#define PHP_ATTR_FMT_OFFSET 1
+#else
+#define PHP_ATTR_FMT_OFFSET 0
+#endif
 
 /* PHPAPI void php_error(int type, const char *format, ...); */
-PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char 
*format, ...);
-PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, int 
type, const char *format, ...);
-PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const 
char *param2, int type, const char *format, ...);
+PHPAPI void php_error_docref0(const char *docref TSRMLS_DC, int type, const char 
*format, ...)
+   PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 3, PHP_ATTR_FMT_OFFSET + 4);
+PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1, int 
type, const char *format, ...)
+   PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5);
+PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const 
char *param2, int type, const char *format, ...)
+   PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6);
 END_EXTERN_C();
 
 #define php_error_docref php_error_docref0

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2003-08-22 Thread Brian France 
bfrance Fri Aug 22 12:43:30 2003 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  
Updated PHP_API_VERSION to 20030820 for the php_setcookie api change
  
  
  
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.192 php-src/main/php.h:1.193
--- php-src/main/php.h:1.192Mon Aug 18 19:19:27 2003
+++ php-src/main/php.h  Fri Aug 22 12:43:29 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.192 2003/08/18 23:19:27 wez Exp $ */
+/* $Id: php.h,v 1.193 2003/08/22 16:43:29 bfrance Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -26,7 +26,7 @@
 #include dmalloc.h
 #endif
 
-#define PHP_API_VERSION 20030518
+#define PHP_API_VERSION 20030820
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2003-08-03 Thread Zeev Suraski 
zeevSun Aug  3 13:42:01 2003 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  Remove unnecessary macro
  
  
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.190 php-src/main/php.h:1.191
--- php-src/main/php.h:1.190Fri Jun 27 03:43:42 2003
+++ php-src/main/php.h  Sun Aug  3 13:42:01 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.190 2003/06/27 07:43:42 sas Exp $ */
+/* $Id: php.h,v 1.191 2003/08/03 17:42:01 zeev Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -322,7 +322,6 @@
 #define PHP_NAMED_FE   ZEND_NAMED_FE
 #define PHP_FE ZEND_FE
 #define PHP_FALIAS ZEND_FALIAS
-#define PHP_STATIC_FE  ZEND_STATIC_FE
 #define PHP_ME  ZEND_ME
 
 #define PHP_MODULE_STARTUP_N   ZEND_MODULE_STARTUP_N



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /main php.h

2003-06-27 Thread Sascha Schumann 
sas Fri Jun 27 03:43:42 2003 EDT

  Modified files:  
/php-src/main   php.h 
  Log:
  undefine macros before defining them
  
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.189 php-src/main/php.h:1.190
--- php-src/main/php.h:1.189Tue Jun 10 16:03:41 2003
+++ php-src/main/php.h  Fri Jun 27 03:43:42 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.189 2003/06/10 20:03:41 imajes Exp $ */
+/* $Id: php.h,v 1.190 2003/06/27 07:43:42 sas Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -123,11 +123,13 @@
 
 #ifndef HAVE_STRLCPY
 PHPAPI size_t php_strlcpy(char *dst, const char *src, size_t siz);
+#undef strlcpy
 #define strlcpy php_strlcpy
 #endif
 
 #ifndef HAVE_STRLCAT
 PHPAPI size_t php_strlcat(char *dst, const char *src, size_t siz);
+#undef strlcat
 #define strlcat php_strlcat
 #endif
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php