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

2008-07-17 Thread Nuno Lopes
nlopess Thu Jul 17 14:35:33 2008 UTC

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  update PCRE symbols
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_compat.h?r1=1.34r2=1.35diff_format=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.34 php-src/main/php_compat.h:1.35
--- php-src/main/php_compat.h:1.34  Mon Dec 31 07:12:18 2007
+++ php-src/main/php_compat.h   Thu Jul 17 14:35:33 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.34 2007/12/31 07:12:18 sebastian Exp $ */
+/* $Id: php_compat.h,v 1.35 2008/07/17 14:35:33 nlopess Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -56,6 +56,7 @@
 #define _pcre_xclass   php__pcre_xclass
 #define pcre_callout   php_pcre_callout
 #define _pcre_OP_lengths   php__pcre_OP_lengths
+#define _pcre_utt_namesphp__pcre_utt_names
 #define _pcre_default_tables   php__pcre_default_tables
 #define pcre_get_stringtable_entries   php_pcre_get_stringtable_entries
 #define _pcre_is_newline   php__pcre_is_newline



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



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

2007-05-07 Thread Nuno Lopes
nlopess Mon May  7 15:43:21 2007 UTC

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  update pcre symbols list
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_compat.h?r1=1.32r2=1.33diff_format=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.32 php-src/main/php_compat.h:1.33
--- php-src/main/php_compat.h:1.32  Sun Feb 25 18:48:19 2007
+++ php-src/main/php_compat.h   Mon May  7 15:43:21 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.32 2007/02/25 18:48:19 nlopess Exp $ */
+/* $Id: php_compat.h,v 1.33 2007/05/07 15:43:21 nlopess Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -56,8 +56,7 @@
 #define _pcre_xclass   php__pcre_xclass
 #define pcre_callout   php_pcre_callout
 #define _pcre_OP_lengths   php__pcre_OP_lengths
-/* this one doesn't work because pcre.h isn't included from the 
pcre_chartables.c file
-#define _pcre_default_tables   php__pcre_default_tables */
+#define _pcre_default_tables   php__pcre_default_tables
 #define pcre_get_stringtable_entries   php_pcre_get_stringtable_entries
 #define _pcre_is_newline   php__pcre_is_newline
 #define pcre_stack_freephp_pcre_stack_free

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



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

2007-02-25 Thread Nuno Lopes
nlopess Sun Feb 25 18:48:19 2007 UTC

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  MFB: update pcre symbol list
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_compat.h?r1=1.31r2=1.32diff_format=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.31 php-src/main/php_compat.h:1.32
--- php-src/main/php_compat.h:1.31  Mon Jan  1 09:29:35 2007
+++ php-src/main/php_compat.h   Sun Feb 25 18:48:19 2007
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.31 2007/01/01 09:29:35 sebastian Exp $ */
+/* $Id: php_compat.h,v 1.32 2007/02/25 18:48:19 nlopess Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -32,7 +32,7 @@
 #define pcre_compile2  php_pcre_compile2
 #define pcre_copy_substringphp_pcre_copy_substring
 #define pcre_exec  php_pcre_exec
-#define pcre_get_substring php_pcre_substring
+#define pcre_get_substring php_pcre_get_substring
 #define pcre_get_substring_listphp_pcre_get_substring_list
 #define pcre_info  php_pcre_info
 #define pcre_maketablesphp_pcre_maketables
@@ -43,7 +43,6 @@
 #define pcre_mallocphp_pcre_malloc
 #define pcre_configphp_pcre_config
 #define pcre_copy_named_substring php_pcre_copy_named_substring
-#define pcre_dfa_exec  php_pcre_dfa_exec
 #define pcre_free_substringphp_pcre_free_substring
 #define pcre_free_substring_list php_pcre_free_substring_list
 #define pcre_get_named_substring php_pcre_get_named_substring
@@ -55,6 +54,22 @@
 #define _pcre_ucp_othercasephp__pcre_ucp_othercase
 #define _pcre_valid_utf8   php__pcre_valid_utf8
 #define _pcre_xclass   php__pcre_xclass
+#define pcre_callout   php_pcre_callout
+#define _pcre_OP_lengths   php__pcre_OP_lengths
+/* this one doesn't work because pcre.h isn't included from the 
pcre_chartables.c file
+#define _pcre_default_tables   php__pcre_default_tables */
+#define pcre_get_stringtable_entries   php_pcre_get_stringtable_entries
+#define _pcre_is_newline   php__pcre_is_newline
+#define pcre_stack_freephp_pcre_stack_free
+#define pcre_stack_malloc  php_pcre_stack_malloc
+#define _pcre_utf8_table1  php__pcre_utf8_table1
+#define _pcre_utf8_table1_size php__pcre_utf8_table1_size
+#define _pcre_utf8_table2  php__pcre_utf8_table2
+#define _pcre_utf8_table3  php__pcre_utf8_table3
+#define _pcre_utf8_table4  php__pcre_utf8_table4
+#define _pcre_utt  php__pcre_utt
+#define _pcre_utt_size php__pcre_utt_size
+#define _pcre_was_newline  php__pcre_was_newline
 #endif
 
 #define lookup php_lookup

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



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

2006-08-23 Thread Andrei Zmievski
andrei  Wed Aug 23 20:39:37 2006 UTC

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  MFB
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_compat.h?r1=1.29r2=1.30diff_format=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.29 php-src/main/php_compat.h:1.30
--- php-src/main/php_compat.h:1.29  Wed May 31 17:19:05 2006
+++ php-src/main/php_compat.h   Wed Aug 23 20:39:37 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.29 2006/05/31 17:19:05 andrei Exp $ */
+/* $Id: php_compat.h,v 1.30 2006/08/23 20:39:37 andrei Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -41,6 +41,20 @@
 #define pcre_fullinfo  php_pcre_fullinfo
 #define pcre_free  php_pcre_free
 #define pcre_mallocphp_pcre_malloc
+#define pcre_configphp_pcre_config
+#define pcre_copy_named_substring php_pcre_copy_named_substring
+#define pcre_dfa_exec  php_pcre_dfa_exec
+#define pcre_free_substringphp_pcre_free_substring
+#define pcre_free_substring_list php_pcre_free_substring_list
+#define pcre_get_named_substring php_pcre_get_named_substring
+#define pcre_get_stringnumber  php_pcre_get_stringnumber
+#define pcre_refcount  php_pcre_refcount
+#define _pcre_ord2utf8 php__pcre_ord2utf8
+#define _pcre_try_flipped  php__pcre_try_flipped
+#define _pcre_ucp_findprop php__pcre_ucp_findprop
+#define _pcre_ucp_othercasephp__pcre_ucp_othercase
+#define _pcre_valid_utf8   php__pcre_valid_utf8
+#define _pcre_xclass   php__pcre_xclass
 #endif
 
 #define lookup php_lookup

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



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

2006-05-31 Thread Andrei Zmievski
andrei  Wed May 31 17:19:05 2006 UTC

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  MFB
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php_compat.h?r1=1.28r2=1.29diff_format=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.28 php-src/main/php_compat.h:1.29
--- php-src/main/php_compat.h:1.28  Mon Apr 10 11:54:54 2006
+++ php-src/main/php_compat.h   Wed May 31 17:19:05 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.28 2006/04/10 11:54:54 sniper Exp $ */
+/* $Id: php_compat.h,v 1.29 2006/05/31 17:19:05 andrei Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -29,6 +29,7 @@
 
 #if defined(HAVE_BUNDLED_PCRE) || !defined(PHP_VERSION)
 #define pcre_compile   php_pcre_compile
+#define pcre_compile2  php_pcre_compile2
 #define pcre_copy_substringphp_pcre_copy_substring
 #define pcre_exec  php_pcre_exec
 #define pcre_get_substring php_pcre_substring

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



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

2006-04-10 Thread Jani Taskinen
sniper  Mon Apr 10 11:54:54 2006 UTC

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  - Silence some PCRE compile warnings
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php_compat.h?r1=1.27r2=1.28diff_format=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.27 php-src/main/php_compat.h:1.28
--- php-src/main/php_compat.h:1.27  Wed Feb  1 13:10:04 2006
+++ php-src/main/php_compat.h   Mon Apr 10 11:54:54 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.27 2006/02/01 13:10:04 jorton Exp $ */
+/* $Id: php_compat.h,v 1.28 2006/04/10 11:54:54 sniper Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -38,6 +38,8 @@
 #define pcre_study php_pcre_study
 #define pcre_version   php_pcre_version
 #define pcre_fullinfo  php_pcre_fullinfo
+#define pcre_free  php_pcre_free
+#define pcre_mallocphp_pcre_malloc
 #endif
 
 #define lookup php_lookup

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



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

2006-02-01 Thread Joe Orton
jorton  Wed Feb  1 13:10:04 2006 UTC

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  Fixed bug #36208 (symbol namespace conflicts using bundled gd).  (Jakub Moc)
  
  
http://cvs.php.net/viewcvs.cgi/php-src/main/php_compat.h?r1=1.26r2=1.27diff_format=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.26 php-src/main/php_compat.h:1.27
--- php-src/main/php_compat.h:1.26  Sun Jan  1 13:09:57 2006
+++ php-src/main/php_compat.h   Wed Feb  1 13:10:04 2006
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.26 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: php_compat.h,v 1.27 2006/02/01 13:10:04 jorton Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -319,6 +319,12 @@
 #define term_source php_gd_term_source
 #define writewbmp php_gd_writewbmp
 #define ZeroDataBlock php_gd_ZeroDataBlock
+#define gdCacheCreate php_gd_gdCacheCreate
+#define gdCacheDelete php_gd_gdCacheDelete
+#define gdCacheGet php_gd_gdCacheGet
+#define gdFontCacheSetup php_gd_gdFontCacheSetup
+#define gdFontCacheShutdown php_gd_gdFontCacheShutdown
+#define gdFreeFontCache php_gd_gdFreeFontCache
 #endif /* HAVE_GD_BUNDLED */
 
 /* Define to specify how much context to retain around the current parse

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



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

2005-02-23 Thread Anantha Kesari H Y
hyanantha   Wed Feb 23 05:31:47 2005 EDT

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  NetWare can make use autoconf generated header file
  
  
http://cvs.php.net/diff.php/php-src/main/php_compat.h?r1=1.22r2=1.23ty=u
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.22 php-src/main/php_compat.h:1.23
--- php-src/main/php_compat.h:1.22  Sun Jan  9 16:05:06 2005
+++ php-src/main/php_compat.h   Wed Feb 23 05:31:44 2005
@@ -16,15 +16,13 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.22 2005/01/09 21:05:06 sniper Exp $ */
+/* $Id: php_compat.h,v 1.23 2005/02/23 10:31:44 hyanantha Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
 
 #ifdef PHP_WIN32
 #include config.w32.h
-#elif defined(NETWARE)
-#include config.nw.h
 #else
 #include php_config.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_compat.h

2003-08-14 Thread Jani Taskinen
sniper  Sat Aug  9 10:27:16 2003 EDT

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  MFB
  
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.17 php-src/main/php_compat.h:1.18
--- php-src/main/php_compat.h:1.17  Fri Jul 25 07:41:33 2003
+++ php-src/main/php_compat.h   Sat Aug  9 10:27:16 2003
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.17 2003/07/25 11:41:33 edink Exp $ */
+/* $Id: php_compat.h,v 1.18 2003/08/09 14:27:16 sniper Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -69,7 +69,9 @@
 #define XmlGetUtf8InternalEncodingNS php_XmlGetUtf8InternalEncodingNS
 #define XmlGetUtf8InternalEncoding php_XmlGetUtf8InternalEncoding
 #define XmlInitEncoding php_XmlInitEncoding
+#define XmlInitEncodingNS php_XmlInitEncodingNS
 #define XmlInitUnknownEncoding php_XmlInitUnknownEncoding
+#define XmlInitUnknownEncodingNS php_XmlInitUnknownEncodingNS
 #define XML_ParseBuffer php_XML_ParseBuffer
 #define XML_Parse php_XML_Parse
 #define XML_ParserCreate_MM php_XML_ParserCreate_MM
@@ -77,6 +79,7 @@
 #define XML_ParserCreate php_XML_ParserCreate
 #define XML_ParserFree php_XML_ParserFree
 #define XmlParseXmlDecl php_XmlParseXmlDecl
+#define XmlParseXmlDeclNS php_XmlParseXmlDeclNS
 #define XmlPrologStateInitExternalEntity php_XmlPrologStateInitExternalEntity
 #define XmlPrologStateInit php_XmlPrologStateInit
 #define XML_SetAttlistDeclHandler php_XML_SetAttlistDeclHandler
@@ -115,6 +118,13 @@
 #define XML_UseParserAsHandlerArg php_XML_UseParserAsHandlerArg
 #define XmlUtf16Encode php_XmlUtf16Encode
 #define XmlUtf8Encode php_XmlUtf8Encode
+#define XML_FreeContentModel php_XML_FreeContentModel
+#define XML_MemMalloc php_XML_MemMalloc
+#define XML_MemRealloc php_XML_MemRealloc
+#define XML_MemFree php_XML_MemFree
+#define XML_UseForeignDTD php_XML_UseForeignDTD
+#define XML_GetFeatureList php_XML_GetFeatureList
+#define XML_ParserReset php_XML_ParserReset
 
 /* Define to specify how much context to retain around the current parse
point. */



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



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

2003-07-25 Thread Edin Kadribasic
edink   Fri Jul 25 07:41:33 2003 EDT

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  Partial MDB
  
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.16 php-src/main/php_compat.h:1.17
--- php-src/main/php_compat.h:1.16  Thu Jul 10 12:08:56 2003
+++ php-src/main/php_compat.h   Fri Jul 25 07:41:33 2003
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.16 2003/07/10 16:08:56 sniper Exp $ */
+/* $Id: php_compat.h,v 1.17 2003/07/25 11:41:33 edink Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -125,6 +125,10 @@
 
 /* Define to make XML Namespaces functionality available. */
 #define XML_NS 1
+#endif
+
+#ifdef PHP_EXPORTS
+#define PCRE_STATIC
 #endif
 
 #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_compat.h

2003-07-10 Thread Jani Taskinen
sniper  Thu Jul 10 12:08:57 2003 EDT

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  Fixed bug #24563 (preg_match() crashes PHP under Apache2)
  
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.15 php-src/main/php_compat.h:1.16
--- php-src/main/php_compat.h:1.15  Fri Jul  4 14:19:02 2003
+++ php-src/main/php_compat.h   Thu Jul 10 12:08:56 2003
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.15 2003/07/04 18:19:02 sterling Exp $ */
+/* $Id: php_compat.h,v 1.16 2003/07/10 16:08:56 sniper Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -39,6 +39,7 @@
 #define pcre_maketablesphp_pcre_maketables
 #define pcre_study php_pcre_study
 #define pcre_version   php_pcre_version
+#define pcre_fullinfo  php_pcre_fullinfo
 #endif
 
 #define lookup php_lookup



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



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

2003-07-04 Thread Sterling Hughes
sterlingFri Jul  4 14:19:02 2003 EDT

  Modified files:  
/php-src/main   php_compat.h 
  Log:
  avoid external conflicts in apache
  
  
Index: php-src/main/php_compat.h
diff -u php-src/main/php_compat.h:1.14 php-src/main/php_compat.h:1.15
--- php-src/main/php_compat.h:1.14  Tue Jun 10 16:03:41 2003
+++ php-src/main/php_compat.h   Fri Jul  4 14:19:02 2003
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_compat.h,v 1.14 2003/06/10 20:03:41 imajes Exp $ */
+/* $Id: php_compat.h,v 1.15 2003/07/04 18:19:02 sterling Exp $ */
 
 #ifndef PHP_COMPAT_H
 #define PHP_COMPAT_H
@@ -47,7 +47,7 @@
 #define hashTableIterInit  php_hashTableIterInit
 #define hashTableIterNext  php_hashTableIterNext
 
-#ifdef HAVE_LIBEXPAT_BUNDLED
+#if defined(HAVE_LIBXML)  defined(HAVE_XML)
 #define XML_DefaultCurrent php_XML_DefaultCurrent
 #define XML_ErrorString php_XML_ErrorString
 #define XML_ExpatVersion php_XML_ExpatVersion



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