[BACK]Return to php.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / main

Diff for /embedaddon/php/main/php.h between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2012/02/21 23:48:05 version 1.1.1.4, 2014/06/15 20:04:01
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 26 Line 26
 #include <dmalloc.h>  #include <dmalloc.h>
 #endif  #endif
   
#define PHP_API_VERSION 20090626#define PHP_API_VERSION 20100412
 #define PHP_HAVE_STREAMS  #define PHP_HAVE_STREAMS
 #define YYDEBUG 0  #define YYDEBUG 0
   
Line 61 Line 61
 #               define PHPAPI  #               define PHPAPI
 #       endif  #       endif
   
#define THREAD_LS#        define THREAD_LS
#define PHP_DIR_SEPARATOR '/'#       define PHP_DIR_SEPARATOR '/'
#if defined(__MacOSX__)#       define PHP_EOL "\n"
#define PHP_EOL "\r" 
#else  
#define PHP_EOL "\n" 
 #endif  #endif
 #endif  
   
 #ifdef NETWARE  #ifdef NETWARE
 /* For php_get_uname() function */  /* For php_get_uname() function */
Line 147  END_EXTERN_C() Line 143  END_EXTERN_C()
 #endif  #endif
   
 #ifndef HAVE_SOCKLEN_T  #ifndef HAVE_SOCKLEN_T
   # if PHP_WIN32
   typedef int socklen_t;
   # else
 typedef unsigned int socklen_t;  typedef unsigned int socklen_t;
   # endif
 #endif  #endif
   
 #define CREATE_MUTEX(a, b)  #define CREATE_MUTEX(a, b)
Line 182  typedef unsigned int socklen_t; Line 182  typedef unsigned int socklen_t;
 #endif  #endif
   
 #include "zend_hash.h"  #include "zend_hash.h"
 #include "php3_compat.h"  
 #include "zend_alloc.h"  #include "zend_alloc.h"
 #include "zend_stack.h"  #include "zend_stack.h"
   
Line 197  typedef unsigned int socklen_t; Line 196  typedef unsigned int socklen_t;
 # endif  # endif
 #endif  #endif
   
 #include "safe_mode.h"  
   
 #ifndef HAVE_STRERROR  #ifndef HAVE_STRERROR
 char *strerror(int);  char *strerror(int);
 #endif  #endif
Line 258  END_EXTERN_C() Line 255  END_EXTERN_C()
 # endif  # endif
 #endif  #endif
   
   #if defined(__GNUC__) && __GNUC__ >= 4
   # define php_ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; }))
   #else
   # define php_ignore_value(x) ((void) (x))
   #endif
   
 /* global variables */  /* global variables */
 #if !defined(PHP_WIN32)  #if !defined(PHP_WIN32)
Line 279  void phperror(char *error); Line 281  void phperror(char *error);
 PHPAPI int php_write(void *buf, uint size TSRMLS_DC);  PHPAPI int php_write(void *buf, uint size TSRMLS_DC);
 PHPAPI int php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1,  PHPAPI int php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1,
                 2);                  2);
   PHPAPI int php_get_module_initialized(void);
 PHPAPI void php_log_err(char *log_message TSRMLS_DC);  PHPAPI void php_log_err(char *log_message TSRMLS_DC);
 int Debug(char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2);  int Debug(char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2);
 int cfgparse(void);  int cfgparse(void);
Line 332  PHPAPI int php_register_internal_extensions(TSRMLS_D); Line 335  PHPAPI int php_register_internal_extensions(TSRMLS_D);
 PHPAPI int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);  PHPAPI int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
 PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata);  PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata);
 PHPAPI void php_com_initialize(TSRMLS_D);  PHPAPI void php_com_initialize(TSRMLS_D);
   PHPAPI char *php_get_current_user(TSRMLS_D);
 END_EXTERN_C()  END_EXTERN_C()
   
 /* PHP-named Zend macro wrappers */  /* PHP-named Zend macro wrappers */
Line 387  END_EXTERN_C() Line 391  END_EXTERN_C()
   
 /* Output support */  /* Output support */
 #include "main/php_output.h"  #include "main/php_output.h"
 #define PHPWRITE(str, str_len)          php_body_write((str), (str_len) TSRMLS_CC)  
 #define PUTS(str)                                       do {                    \  
         const char *__str = (str);                                              \  
         php_body_write(__str, strlen(__str) TSRMLS_CC); \  
 } while (0)  
   
 #define PUTC(c)                                         (php_body_write(&(c), 1 TSRMLS_CC), (c))  
 #define PHPWRITE_H(str, str_len)        php_header_write((str), (str_len) TSRMLS_CC)  
 #define PUTS_H(str)                                     do {                            \  
         const char *__str = (str);                                                      \  
         php_header_write(__str, strlen(__str) TSRMLS_CC);       \  
 } while (0)  
   
 #define PUTC_H(c)                                       (php_header_write(&(c), 1 TSRMLS_CC), (c))  
   
 #include "php_streams.h"  #include "php_streams.h"
 #include "php_memory_streams.h"  #include "php_memory_streams.h"
 #include "fopen_wrappers.h"  #include "fopen_wrappers.h"
Line 453  END_EXTERN_C() Line 444  END_EXTERN_C()
 #define XtOffsetOf(s_type, field) XtOffset(s_type*, field)  #define XtOffsetOf(s_type, field) XtOffset(s_type*, field)
 #endif  #endif
 #endif /* !XtOffsetOf */  #endif /* !XtOffsetOf */
   
 #if SUHOSIN_PATCH  
 #include "suhosin_patch.h"  
 #endif  
   
 #endif  #endif
   
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>