[PHP-CVS] cvs: php-src /ext/tidy tidy.c

[Nuno Lopes]

nlopess         Wed Apr 19 22:10:44 2006 UTC

  Modified files:              
    /php-src/ext/tidy   tidy.c 
  Log:
  MFB: fix build with newer libtidy versions on windows
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/tidy.c?r1=1.78&r2=1.79&diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.78 php-src/ext/tidy/tidy.c:1.79
--- php-src/ext/tidy/tidy.c:1.78        Wed Mar 29 15:08:52 2006
+++ php-src/ext/tidy/tidy.c     Wed Apr 19 22:10:44 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: tidy.c,v 1.78 2006/03/29 15:08:52 tony2001 Exp $ */
+/* $Id: tidy.c,v 1.79 2006/04/19 22:10:44 nlopess Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,6 +36,11 @@
 #include "tidy.h"
 #include "buffio.h"
 
+/* compatibility with older versions of libtidy */
+#ifndef TIDY_CALL
+#define TIDY_CALL
+#endif
+
 #define PHP_TIDY_MODULE_VERSION        "2.0"
 
 /* {{{ ext/tidy macros
@@ -333,22 +338,22 @@
 ZEND_GET_MODULE(tidy)
 #endif
 
-void *php_tidy_malloc(size_t len)
+void* TIDY_CALL php_tidy_malloc(size_t len)
 {
        return emalloc(len);
 }
 
-void *php_tidy_realloc(void *buf, size_t len)
+void* TIDY_CALL php_tidy_realloc(void *buf, size_t len)
 {
        return erealloc(buf, len);
 }
 
-void php_tidy_free(void *buf)
+void TIDY_CALL php_tidy_free(void *buf)
 {
        efree(buf);
 }
 
-void php_tidy_panic(ctmbstr msg)
+void TIDY_CALL php_tidy_panic(ctmbstr msg)
 {
        TSRMLS_FETCH();
        php_error_docref(NULL TSRMLS_CC, E_ERROR, "Could not allocate memory 
for tidy! (Reason: %s)", (char *)msg);
@@ -980,7 +985,7 @@
        php_info_print_table_start();
        php_info_print_table_header(2, "Tidy support", "enabled");
        php_info_print_table_row(2, "libTidy Release", (char 
*)tidyReleaseDate());
-       php_info_print_table_row(2, "Extension Version", 
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.78 2006/03/29 15:08:52 tony2001 Exp 
$)");
+       php_info_print_table_row(2, "Extension Version", 
PHP_TIDY_MODULE_VERSION " ($Id: tidy.c,v 1.79 2006/04/19 22:10:44 nlopess Exp 
$)");
        php_info_print_table_end();
 
        DISPLAY_INI_ENTRIES();

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