/[smeserver]/rpms/php/sme8/php-5.3.3-gnusrc.patch
ViewVC logotype

Contents of /rpms/php/sme8/php-5.3.3-gnusrc.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Mon Jun 20 19:27:01 2011 UTC (13 years, 4 months ago) by slords
Branch: MAIN
CVS Tags: php-5_3_3-15_el5_sme, php-5_3_3-1_el5_7_3, php-5_3_3-13_el5_9_1, php-5_3_3-16_el5_sme, php-5_3_3-14_el5_sme, php-5_3_3-1_el5_sme_6, php-5_3_3-13_el5_sme_1, php-5_3_3-1_el5_sme_3, php-5_3_3-1_el5_sme_1_0, php-5_3_3-13_el5_sme_2, php-5_3_3-1_el5_sme_1_1, php-5_3_3-17_el5_sme, php-5_3_3-1_el5_7_6, php-5_3_3-13_el5_sme, php-5_3_3-13_el6, php-5_3_3-1_el5_sme_1, HEAD
Branch point for: redhat-upstream
Error occurred while calculating annotation data. 
Import upstream sources
1 diff -up php5.3-201004081030/configure.in.gnusrc php5.3-201004081030/configure.in
2 --- php5.3-201004081030/configure.in.gnusrc 2010-03-19 00:36:53.000000000 +0100
3 +++ php5.3-201004081030/configure.in 2010-04-08 14:32:20.000000000 +0200
4 @@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
5 AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
6 AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
7
8 +AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
9 +
10 dnl Setting up the PHP version based on the information above.
11 dnl -------------------------------------------------------------------------
12
13 diff -up php5.3-201004081030/ext/interbase/interbase.c.gnusrc php5.3-201004081030/ext/interbase/interbase.c
14 --- php5.3-201004081030/ext/interbase/interbase.c.gnusrc 2010-01-03 10:36:55.000000000 +0100
15 +++ php5.3-201004081030/ext/interbase/interbase.c 2010-04-08 14:32:20.000000000 +0200
16 @@ -24,7 +24,6 @@
17 #include "config.h"
18 #endif
19
20 -#define _GNU_SOURCE
21
22 #include "php.h"
23
24 diff -up php5.3-201004081030/ext/pdo_firebird/firebird_driver.c.gnusrc php5.3-201004081030/ext/pdo_firebird/firebird_driver.c
25 --- php5.3-201004081030/ext/pdo_firebird/firebird_driver.c.gnusrc 2010-01-12 14:36:12.000000000 +0100
26 +++ php5.3-201004081030/ext/pdo_firebird/firebird_driver.c 2010-04-08 14:32:20.000000000 +0200
27 @@ -22,7 +22,6 @@
28 #include "config.h"
29 #endif
30
31 -#define _GNU_SOURCE
32
33 #include "php.h"
34 #ifdef ZEND_ENGINE_2
35 diff -up php5.3-201004081030/ext/standard/file.c.gnusrc php5.3-201004081030/ext/standard/file.c
36 --- php5.3-201004081030/ext/standard/file.c.gnusrc 2010-03-19 00:36:53.000000000 +0100
37 +++ php5.3-201004081030/ext/standard/file.c 2010-04-08 14:32:20.000000000 +0200
38 @@ -113,9 +113,6 @@ php_file_globals file_globals;
39 #endif
40
41 #if defined(HAVE_FNMATCH) && !defined(PHP_WIN32)
42 -# ifndef _GNU_SOURCE
43 -# define _GNU_SOURCE
44 -# endif
45 # include <fnmatch.h>
46 #endif
47
48 diff -up php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c.gnusrc php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c
49 --- php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c.gnusrc 2010-03-12 12:36:27.000000000 +0100
50 +++ php5.3-201004081030/ext/zlib/zlib_fopen_wrapper.c 2010-04-08 14:33:46.000000000 +0200
51 @@ -19,8 +19,6 @@
52
53 /* $Id: zlib_fopen_wrapper.c 296107 2010-03-12 10:28:59Z jani $ */
54
55 -#define _GNU_SOURCE
56 -
57 #include "php.h"
58 #include "php_zlib.h"
59 #include "fopen_wrappers.h"
60 diff -up php5.3-201004081030/main/php.h.gnusrc php5.3-201004081030/main/php.h
61 --- php5.3-201004081030/main/php.h.gnusrc 2010-03-12 12:36:33.000000000 +0100
62 +++ php5.3-201004081030/main/php.h 2010-04-08 14:32:20.000000000 +0200
63 @@ -30,6 +30,7 @@
64 #define PHP_HAVE_STREAMS
65 #define YYDEBUG 0
66
67 +#include "php_config.h"
68 #include "php_version.h"
69 #include "zend.h"
70 #include "zend_qsort.h"
71 diff -up php5.3-201004081030/main/streams/cast.c.gnusrc php5.3-201004081030/main/streams/cast.c
72 --- php5.3-201004081030/main/streams/cast.c.gnusrc 2010-01-19 16:36:23.000000000 +0100
73 +++ php5.3-201004081030/main/streams/cast.c 2010-04-08 14:33:15.000000000 +0200
74 @@ -18,7 +18,6 @@
75
76 /* $Id: cast.c 293732 2010-01-19 13:44:08Z jani $ */
77
78 -#define _GNU_SOURCE
79 #include "php.h"
80 #include "php_globals.h"
81 #include "php_network.h"
82 diff -up php5.3-201004081030/main/streams/memory.c.gnusrc php5.3-201004081030/main/streams/memory.c
83 --- php5.3-201004081030/main/streams/memory.c.gnusrc 2010-01-03 10:36:58.000000000 +0100
84 +++ php5.3-201004081030/main/streams/memory.c 2010-04-08 14:32:20.000000000 +0200
85 @@ -18,7 +18,6 @@
86
87 /* $Id: memory.c 293036 2010-01-03 09:23:27Z sebastian $ */
88
89 -#define _GNU_SOURCE
90 #include "php.h"
91
92 PHPAPI int php_url_decode(char *str, int len);
93 diff -up php5.3-201004081030/Zend/zend_language_parser.c.gnusrc php5.3-201004081030/Zend/zend_language_parser.c
94 --- php5.3-201004081030/Zend/zend_language_parser.c.gnusrc 2010-04-08 12:41:33.000000000 +0200
95 +++ php5.3-201004081030/Zend/zend_language_parser.c 2010-04-08 14:32:20.000000000 +0200
96 @@ -366,6 +366,8 @@
97 #include "zend_API.h"
98 #include "zend_constants.h"
99
100 +#include <string.h>
101 +
102
103 #define YYERROR_VERBOSE
104 #define YYSTYPE znode
105 --- php5.3-201005241430/main/streams/streams.c.gnusrc 2010-05-18 22:35:37.000000000 +0200
106 +++ php5.3-201005241430/main/streams/streams.c 2010-05-24 17:02:08.900419954 +0200
107 @@ -21,7 +21,6 @@
108
109 /* $Id: streams.c 299466 2010-05-18 19:39:39Z pajoye $ */
110
111 -#define _GNU_SOURCE
112 #include "php.h"
113 #include "php_globals.h"
114 #include "php_network.h"
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed