pajoye Sun Jun 3 17:43:13 2007 UTC
Modified files:
/php-src/ext/gd gd.c
/php-src/ext/gd/libgd gd.h
Log:
- @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, GD_RELEASE_VERSION
GD_EXTRA_VERSION and GD_VERSION_STRING
- fix #ifdef else clause
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.376&r2=1.377&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.376 php-src/ext/gd/gd.c:1.377
--- php-src/ext/gd/gd.c:1.376 Sat Jun 2 15:41:02 2007
+++ php-src/ext/gd/gd.c Sun Jun 3 17:43:13 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.376 2007/06/02 15:41:02 pajoye Exp $ */
+/* $Id: gd.c,v 1.377 2007/06/03 17:43:13 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1233,6 +1233,18 @@
REGISTER_LONG_CONSTANT("GD_BUNDLED", 0, CONST_CS | CONST_PERSISTENT);
#endif
+#ifdef GD_VERSION_STRING
+ REGISTER_STRING_CONSTANT("GD_VERSION", GD_VERSION_STRING, CONST_CS |
CONST_PERSISTENT);
+#endif
+
+#if defined(GD_MAJOR_VERSION) && defined(GD_MINOR_VERSION) &&
defined(GD_RELEASE_VERSION) && defined(GD_EXTRA_VERSION)
+ REGISTER_LONG_CONSTANT("GD_MAJOR_VERSION", GD_MAJOR_VERSION, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("GD_MINOR_VERSION", GD_MINOR_VERSION, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("GD_RELEASE_VERSION", GD_RELEASE_VERSION,
CONST_CS | CONST_PERSISTENT);
+ REGISTER_STRING_CONSTANT("GD_EXTRA_VERSION", GD_EXTRA_VERSION, CONST_CS
| CONST_PERSISTENT);
+#endif
+
+
#ifdef HAVE_GD_PNG
/*
* cannot include #include "png.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.32&r2=1.33&diff_format=u
Index: php-src/ext/gd/libgd/gd.h
diff -u php-src/ext/gd/libgd/gd.h:1.32 php-src/ext/gd/libgd/gd.h:1.33
--- php-src/ext/gd/libgd/gd.h:1.32 Mon Apr 23 15:06:13 2007
+++ php-src/ext/gd/libgd/gd.h Sun Jun 3 17:43:13 2007
@@ -7,11 +7,17 @@
#include "php_compat.h"
+#define GD_MAJOR_VERSION 2
+#define GD_MINOR_VERSION 0
+#define GD_RELEASE_VERSION 35
+#define GD_EXTRA_VERSION ""
+#define GD_VERSION_STRING "2.0.35"
+
#ifdef NETWARE
/* default fontpath for netware systems */
#define DEFAULT_FONTPATH "sys:/java/nwgfx/lib/x11/fonts/ttf;."
#define PATHSEPARATOR ";"
-#elif WIN32
+#elif defined(WIN32)
/* default fontpath for windows systems */
#define DEFAULT_FONTPATH "c:\\winnt\\fonts;c:\\windows\\fonts;."
#define PATHSEPARATOR ";"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
