Re: cvs: php4 /main php_streams.h streams.c

None we could think of... Zeev At 21:59 18/03/2002, Andi Gutmans wrote:

Can't we just nuke STREAMS_C? Is there no way to accomplish what Wez needs without this? Andi At 19:47 18/03/2002 +0000, Zeev Suraski wrote:

zeev            Mon Mar 18 14:47:50 2002 EDT

Modified files:

    /php4/main  php_streams.h streams.c

Log: Fix build under Release_TS Maybe separating TSRMLS away wasn't such a good idea (sorry Wez :) Index: php4/main/php_streams.h diff -u php4/main/php_streams.h:1.17 php4/main/php_streams.h:1.18

--- php4/main/php_streams.h:1.17        Mon Mar 18 13:54:32 2002
+++ php4/main/php_streams.h     Mon Mar 18 14:47:50 2002

@@ -41,12 +41,12 @@

 # define STREAMS_REL_CC        , STREAMS_REL_C

#else

-# define STREAMS_D             TSRMLS_D
-# define STREAMS_C             TSRMLS_C

-# define STREAMS_REL_C TSRMLS_C

-# define STREAMS_DC            TSRMLS_DC
-# define STREAMS_CC            TSRMLS_CC
-# define STREAMS_REL_CC        TSRMLS_CC

+# define STREAMS_D +# define STREAMS_C +# define STREAMS_REL_C +# define STREAMS_DC +# define STREAMS_CC +# define STREAMS_REL_CC #endif /* these functions relay the file/line number information. They are depth aware, so they will pass @@ -63,7 +63,7 @@ #define php_stream_fopen_from_pipe_rel(file,

mode)     _php_stream_fopen_from_pipe((file), (mode) STREAMS_REL_CC TSRMLS_CC)

-#define php_stream_fopen_tmpfile_rel() _php_stream_fopen_tmpfile(STREAMS_REL_C TSRMLS_CC) +#define php_stream_fopen_tmpfile_rel() _php_stream_fopen_tmpfile(0 STREAMS_REL_CC TSRMLS_CC) #define php_stream_fopen_temporary_file_rel(dir, pfx,

opened_path)     _php_stream_fopen_temporary_file((dir), (pfx), (opened_path) STREAMS_REL_CC TSRMLS_CC)

@@ -205,8 +205,8 @@ PHPAPI php_stream *_php_stream_fopen_from_pipe(FILE *file, const char *mode STREAMS_DC TSRMLS_DC); #define php_stream_fopen_from_pipe(file, mode) _php_stream_fopen_from_pipe((file), (mode) STREAMS_CC TSRMLS_CC) -PHPAPI php_stream *_php_stream_fopen_tmpfile(STREAMS_D TSRMLS_DC); -#define

php_stream_fopen_tmpfile()     _php_stream_fopen_tmpfile(STREAMS_C TSRMLS_CC)
+PHPAPI php_stream *_php_stream_fopen_tmpfile(int dummy STREAMS_DC TSRMLS_DC);
+#define php_stream_fopen_tmpfile()     _php_stream_fopen_tmpfile(0 STREAMS_CC TSRMLS_CC)

PHPAPI php_stream *_php_stream_fopen_temporary_file(const char *dir, const char *pfx, char **opened_path STREAMS_DC TSRMLS_DC); #define php_stream_fopen_temporary_file(dir, pfx, opened_path) _php_stream_fopen_temporary_file((dir), (pfx), (opened_path) STREAMS_CC TSRMLS_CC) Index: php4/main/streams.c diff -u php4/main/streams.c:1.31 php4/main/streams.c:1.32

--- php4/main/streams.c:1.31    Mon Mar 18 14:13:11 2002

+++ php4/main/streams.c Mon Mar 18 14:47:50 2002 @@ -447,7 +447,7 @@

        return NULL;

} -PHPAPI php_stream *_php_stream_fopen_tmpfile(STREAMS_D TSRMLS_DC) +PHPAPI php_stream *_php_stream_fopen_tmpfile(int dummy STREAMS_DC TSRMLS_DC) {

        FILE *fp;
        php_stream *stream;

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