Re: Re: cvs: php4 /ext/gd gd.c php_gd.h /ext/gd/libgd gd.c gd.h gd_topal.c

It must be php_error_docref(NULL TSRMLS_CC, E_whatever...) I've just comitted it. marcus At 15:18 22.08.2002, you wrote:

Tim Toohey wrote:

ttoohey         Thu Aug 22 03:28:26 2002 EDT

Modified files:

    /php4/ext/gd        gd.c php_gd.h
    /php4/ext/gd/libgd  gd.c gd.h gd_topal.c

This broke the ZTS build of ext/gd. The patch below makes it compile again, but with warnings. Someone please look this over: Index: gd.c =================================================================== RCS file: /repository/php4/ext/gd/gd.c,v retrieving revision 1.203 diff -u -r1.203 gd.c

--- gd.c        22 Aug 2002 07:28:24 -0000      1.203
+++ gd.c        22 Aug 2002 13:16:47 -0000

@@ -669,15 +669,15 @@

        switch( result )
        {
        case -1:
-               php_error_docref(NULL, E_ERROR, "Image1 must be TrueColor"

);

+               php_error_docref(NULL, E_ERROR TSRMLS_CC, "Image1 must be

TrueCo lor");

                RETURN_FALSE;
                break;
        case -2:
-               php_error_docref(NULL, E_ERROR, "Image2 must be Palette"

);

+               php_error_docref(NULL, E_ERROR TSRMLS_CC, "Image2 must be

Palett e");

                RETURN_FALSE;
                break;
        case -3:
-               php_error_docref(NULL, E_ERROR, "Image1 and Image2 must be

the s ame size" );

+               php_error_docref(NULL, E_ERROR TSRMLS_CC, "Image1 and

Image2 mus t be the same size");

                RETURN_FALSE;
                break;
        }

-- Sebastian Bergmann

  http://sebastian-bergmann.de/                 http://phpOpenTracker.de/

Did I help you? Consider a gift: http://wishlist.sebastian-bergmann.de/ -- PHP Development Mailing List <http://www.php.net/> To unsubscribe, visit: http://www.php.net/unsub.php