[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
helly Fri Nov 14 02:41:06 2003 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
Adjust to latest conversion cast changes
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.84 php-src/ext/simplexml/simplexml.c:1.85
--- php-src/ext/simplexml/simplexml.c:1.84 Thu Nov 13 15:32:37 2003
+++ php-src/ext/simplexml/simplexml.c Fri Nov 14 02:41:05 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.84 2003/11/13 20:32:37 helly Exp $ */
+/* $Id: simplexml.c,v 1.85 2003/11/14 07:41:05 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -955,7 +955,7 @@
xmlFree(contents);
}
if (should_free) {
- /*zval_dtor(&free_obj);*/
+ zval_dtor(&free_obj);
}
return rv;
}
@@ -1429,7 +1429,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.84 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.85 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On 2003/11/14, at 8:24, Ilia Alshanetsky wrote: On November 13, 2003 05:54 pm, you wrote: Again, this is breaking our naming conventions. (yeah I know there's legacy stuff). How about time_nanosleeop()? Heh, I can't ever seem to get the names right. That said, I think in this case it would be better to keep the function name as is. So, far when making a PHP functions, which are wrappers around a C functions, the C function names were retained. Consider existing sleep() functions, majority of string functions, etc... I agree with Ilia this time. I don't see a significant reason to rename it to a fancy name. Anyway, I don't much like the situation that those two functions, usleep() and nanosleep() are not always available in every build. Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file 001.phpt
moriyoshi Fri Nov 14 03:59:31 2003 EDT
Modified files:
/php-src/ext/standard/tests/file001.phpt
Log:
ctime (#10) may differ on several filesystems.
# I confirmed it on Darwin
Index: php-src/ext/standard/tests/file/001.phpt
diff -u php-src/ext/standard/tests/file/001.phpt:1.9
php-src/ext/standard/tests/file/001.phpt:1.10
--- php-src/ext/standard/tests/file/001.phpt:1.9Thu Oct 23 23:31:54 2003
+++ php-src/ext/standard/tests/file/001.phptFri Nov 14 03:59:30 2003
@@ -58,7 +58,7 @@
$ls = lstat ('test.link');
for ($i = 0; $i <= 11; $i++) {
if ($ls[$i] != $s[$i]) {
- if ($i != 6 && $i != 11) echo "test.link lstat and stat differ at element
$i\n";
+ if ($i != 6 && $i != 10 && $i != 11) echo "test.link lstat and stat differ at
element $i\n";
}
}
echo "test.file is " . filetype('test.file') . "\n";
@@ -131,7 +131,6 @@
test.link lstat and stat differ at element 7
test.link lstat and stat differ at element 8
test.link lstat and stat differ at element 9
-test.link lstat and stat differ at element 10
test.file is file
test.link is link
test.file permissions are 0744
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard/tests/file 001.phpt
moriyoshi Fri Nov 14 04:01:48 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard/tests/file001.phpt
Log:
MFH(r-1.10): ctime (#10) may differ on several filesystems.
Index: php-src/ext/standard/tests/file/001.phpt
diff -u php-src/ext/standard/tests/file/001.phpt:1.7.2.1
php-src/ext/standard/tests/file/001.phpt:1.7.2.2
--- php-src/ext/standard/tests/file/001.phpt:1.7.2.1Sun Feb 9 08:20:34 2003
+++ php-src/ext/standard/tests/file/001.phptFri Nov 14 04:01:47 2003
@@ -58,7 +58,7 @@
$ls = lstat ('test.link');
for ($i = 0; $i <= 11; $i++) {
if ($ls[$i] != $s[$i]) {
- if ($i != 6 && $i != 11) echo "test.link lstat and stat differ at element
$i\n";
+ if ($i != 6 && $i != 10 && $i != 11) echo "test.link lstat and stat differ at
element $i\n";
}
}
echo "test.file is " . filetype('test.file') . "\n";
@@ -131,7 +131,6 @@
test.link lstat and stat differ at element 7
test.link lstat and stat differ at element 8
test.link lstat and stat differ at element 9
-test.link lstat and stat differ at element 10
test.file is file
test.link is link
test.file permissions are 0744
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/interbase interbase.c
abies Fri Nov 14 05:38:42 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/interbase interbase.c
Log:
Fix the fix [ibase_trans()]
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.91.2.23
php-src/ext/interbase/interbase.c:1.91.2.24
--- php-src/ext/interbase/interbase.c:1.91.2.23 Tue Nov 11 22:05:23 2003
+++ php-src/ext/interbase/interbase.c Fri Nov 14 05:38:41 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: interbase.c,v 1.91.2.23 2003/11/12 03:05:23 iliaa Exp $ */
+/* $Id: interbase.c,v 1.91.2.24 2003/11/14 10:38:41 abies Exp $ */
/* TODO: Arrays, roles?
@@ -624,7 +624,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Interbase Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.23 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.91.2.24 $");
#ifdef COMPILE_DL_INTERBASE
php_info_print_table_row(2, "Dynamic Module", "yes");
#endif
@@ -1411,13 +1411,13 @@
XSQLDA *in_sqlda = NULL, *out_sqlda = NULL;
BIND_BUF *bind_buf = NULL;
int rv = FAILURE;
-
+
IB_RESULT = NULL;
if (argc > 0 && args != NULL) {
SEPARATE_ZVAL(args);
}
-
+
/* allocate sqlda and output buffers */
if (ib_query->out_sqlda) { /* output variables in select, select for update */
IBDEBUG("Query wants XSQLDA for output");
@@ -1493,13 +1493,11 @@
zval ***args;
char tpb[20], *tpbp = NULL;
long trans_argl = 0;
- int tpb_len = 0, argn, link_id = 0, trans_n = 0, i;
+ int tpb_len = 0, argn, link_id, trans_n = 0;
ibase_db_link *ib_link;
ibase_tr_link *ib_trans;
-
- RESET_ERRMSG;
- link_id = IBG(default_link);
+ RESET_ERRMSG;
/* TODO: multi-databases trans */
argn = ZEND_NUM_ARGS();
@@ -1516,9 +1514,9 @@
/* Handle all database links, although we don't support multibase
transactions yet, so only the last one is will be used. */
- for (i = argn-1; i > 0 && Z_TYPE_PP(args[i]) == IS_RESOURCE; i--) {
- ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, args[i], -1,
"InterBase link", le_link, le_plink);
- link_id = Z_LVAL_PP(args[i]);
+ if (argn > 1) {
+ ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, args[argn-1],
-1, "InterBase link", le_link, le_plink);
+ link_id = Z_LVAL_PP(args[argn-1]);
}
/* First argument is transaction parameters */
@@ -1528,7 +1526,8 @@
efree(args);
}
- if (!link_id) {
+ if (argn < 2) {
+ link_id = IBG(default_link);
ZEND_FETCH_RESOURCE2(ib_link, ibase_db_link *, NULL, link_id,
"InterBase link", le_link, le_plink);
}
@@ -1547,8 +1546,8 @@
if (trans_argl & PHP_IBASE_REC_VERSION) {
tpb[tpb_len++] = isc_tpb_rec_version;
}else{
- tpb[tpb_len++] = isc_tpb_no_rec_version; /* default in
read_committed */
- }
+ tpb[tpb_len++] = isc_tpb_no_rec_version; /* default in
read_committed */
+ }
} else if (trans_argl & PHP_IBASE_CONSISTENCY) {
tpb[tpb_len++] = isc_tpb_consistency;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
At 06:24 PM 11/13/2003 -0500, Ilia Alshanetsky wrote: On November 13, 2003 05:54 pm, you wrote: > Again, this is breaking our naming conventions. (yeah I know there's legacy > stuff). > How about time_nanosleeop()? Heh, I can't ever seem to get the names right. That said, I think in this case it would be better to keep the function name as is. So, far when making a PHP functions, which are wrappers around a C functions, the C function names were retained. Consider existing sleep() functions, majority of string functions, etc... Yes, but that is concerning legacy functions when we were too dumb to do the right thing. We agreed that although fixing backwards, we will do the right thing from now on. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
On November 14, 2003 06:19 am, Andi Gutmans wrote: > Yes, but that is concerning legacy functions when we were too dumb to do > the right thing. I don't think the old method of function naming is necessarily bad. If anything it helps people who come from C/C++ environment since the functions they are already familiar are readily avaliable under the same name. For functions that are completely new, I wouldn't even bother to argue and just rename it. But in this case I think it would be counter intuitive to name the function by anything else other then it's C equivalent. This is especially apparent in this case since not a single time related function has a time_* prefix, making it very difficult to find this function in a manual search etc... Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
At 02:12 PM 11/14/2003 -0500, Ilia Alshanetsky wrote: On November 14, 2003 06:19 am, Andi Gutmans wrote: > Yes, but that is concerning legacy functions when we were too dumb to do > the right thing. I don't think the old method of function naming is necessarily bad. If anything it helps people who come from C/C++ environment since the functions they are already familiar are readily avaliable under the same name. For functions that are completely new, I wouldn't even bother to argue and just rename it. But in this case I think it would be counter intuitive to name the function by anything else other then it's C equivalent. This is especially apparent in this case since not a single time related function has a time_* prefix, making it very difficult to find this function in a manual search etc... Ilia, We have had this discussion before and the dev team came to an agreement that we're going to do our best to keep to the naming conventions for new functions. Especially as nanosleep is not an extremely important function I see no problem with it following the correct naming conventions even if it makes it harder to find (which I doubt). The only reason why we're not cleaning up all functions retroactively is because we don't want to break every PHP script out there. But then again, this discussion has already taken place in the past. Andi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
iliaa Fri Nov 14 17:55:55 2003 EDT
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
Rename nanosleep() to time_nanosleep().
Index: php-src/NEWS
diff -u php-src/NEWS:1.1498 php-src/NEWS:1.1499
--- php-src/NEWS:1.1498 Thu Nov 13 15:54:25 2003
+++ php-src/NEWSFri Nov 14 17:55:53 2003
@@ -3,7 +3,7 @@
?? Oct 2003, PHP 5 Beta 3
- Added new functions:
. dba_key_split() to split inifile keys in an array. (Marcus)
- . nanosleep() signal safe sleep (Magnus, Ilia)
+ . time_nanosleep() signal safe sleep (Magnus, Ilia)
- Fixed bug #26072 (--disable-libxml does not work). (Jani)
- Fixed bug #26083 (Non-working write support in ext/dom). (Ilia)
- Fixed bug #24394 (Serializing cross-referenced objects causes segfault).
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.640
php-src/ext/standard/basic_functions.c:1.641
--- php-src/ext/standard/basic_functions.c:1.640Wed Nov 12 18:43:46 2003
+++ php-src/ext/standard/basic_functions.c Fri Nov 14 17:55:54 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.640 2003/11/12 23:43:46 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.641 2003/11/14 22:55:54 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -302,7 +302,7 @@
PHP_FE(sleep,
NULL)
PHP_FE(usleep,
NULL)
#if HAVE_NANOSLEEP
- PHP_FE(nanosleep,
NULL)
+ PHP_FE(time_nanosleep,
NULL)
#endif
PHP_FE(time,
NULL)
PHP_FE(mktime,
NULL)
@@ -1694,9 +1694,9 @@
/* }}} */
#if HAVE_NANOSLEEP
-/* {{{ proto mixed nanosleep(long seconds, long nanoseconds)
+/* {{{ proto mixed time_nanosleep(long seconds, long nanoseconds)
Delay for a number of seconds and nano seconds */
-PHP_FUNCTION(nanosleep)
+PHP_FUNCTION(time_nanosleep)
{
long tv_sec, tv_nsec;
struct timespec php_req, php_rem;
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.127
php-src/ext/standard/basic_functions.h:1.128
--- php-src/ext/standard/basic_functions.h:1.127Wed Nov 12 18:43:46 2003
+++ php-src/ext/standard/basic_functions.h Fri Nov 14 17:55:54 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.127 2003/11/12 23:43:46 iliaa Exp $ */
+/* $Id: basic_functions.h,v 1.128 2003/11/14 22:55:54 iliaa Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -49,7 +49,7 @@
PHP_FUNCTION(sleep);
PHP_FUNCTION(usleep);
#if HAVE_NANOSLEEP
-PHP_FUNCTION(nanosleep);
+PHP_FUNCTION(time_nanosleep);
#endif
PHP_FUNCTION(flush);
PHP_FUNCTION(ip2long);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c basic_functions.h
Thanks.
At 10:55 PM 11/14/2003 +, Ilia Alshanetsky wrote:
iliaa Fri Nov 14 17:55:55 2003 EDT
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
Rename nanosleep() to time_nanosleep().
Index: php-src/NEWS
diff -u php-src/NEWS:1.1498 php-src/NEWS:1.1499
--- php-src/NEWS:1.1498 Thu Nov 13 15:54:25 2003
+++ php-src/NEWSFri Nov 14 17:55:53 2003
@@ -3,7 +3,7 @@
?? Oct 2003, PHP 5 Beta 3
- Added new functions:
. dba_key_split() to split inifile keys in an array. (Marcus)
- . nanosleep() signal safe sleep (Magnus, Ilia)
+ . time_nanosleep() signal safe sleep (Magnus, Ilia)
- Fixed bug #26072 (--disable-libxml does not work). (Jani)
- Fixed bug #26083 (Non-working write support in ext/dom). (Ilia)
- Fixed bug #24394 (Serializing cross-referenced objects causes segfault).
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.640
php-src/ext/standard/basic_functions.c:1.641
--- php-src/ext/standard/basic_functions.c:1.640Wed Nov 12
18:43:46 2003
+++ php-src/ext/standard/basic_functions.c Fri Nov 14 17:55:54 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.640 2003/11/12 23:43:46 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.641 2003/11/14 22:55:54 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -302,7 +302,7 @@
PHP_FE(sleep,
NULL)
PHP_FE(usleep,
NULL)
#if HAVE_NANOSLEEP
- PHP_FE(nanosleep,
NULL)
+ PHP_FE(time_nanosleep,
NULL)
#endif
PHP_FE(time,
NULL)
PHP_FE(mktime,
NULL)
@@ -1694,9 +1694,9 @@
/* }}} */
#if HAVE_NANOSLEEP
-/* {{{ proto mixed nanosleep(long seconds, long nanoseconds)
+/* {{{ proto mixed time_nanosleep(long seconds, long nanoseconds)
Delay for a number of seconds and nano seconds */
-PHP_FUNCTION(nanosleep)
+PHP_FUNCTION(time_nanosleep)
{
long tv_sec, tv_nsec;
struct timespec php_req, php_rem;
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.127
php-src/ext/standard/basic_functions.h:1.128
--- php-src/ext/standard/basic_functions.h:1.127Wed Nov 12
18:43:46 2003
+++ php-src/ext/standard/basic_functions.h Fri Nov 14 17:55:54 2003
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.h,v 1.127 2003/11/12 23:43:46 iliaa Exp $ */
+/* $Id: basic_functions.h,v 1.128 2003/11/14 22:55:54 iliaa Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -49,7 +49,7 @@
PHP_FUNCTION(sleep);
PHP_FUNCTION(usleep);
#if HAVE_NANOSLEEP
-PHP_FUNCTION(nanosleep);
+PHP_FUNCTION(time_nanosleep);
#endif
PHP_FUNCTION(flush);
PHP_FUNCTION(ip2long);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ming ming.c
fmk Fri Nov 14 19:53:39 2003 EDT Modified files: /php-src/ext/ming ming.c Log: Adding missing class init's for new ming 0.3a functions Index: php-src/ext/ming/ming.c diff -u php-src/ext/ming/ming.c:1.59 php-src/ext/ming/ming.c:1.60 --- php-src/ext/ming/ming.c:1.59Wed Nov 12 04:12:50 2003 +++ php-src/ext/ming/ming.c Fri Nov 14 19:53:38 2003 @@ -17,14 +17,14 @@ +--+ */ -/* $Id: ming.c,v 1.59 2003/11/12 09:12:50 helly Exp $ */ +/* $Id: ming.c,v 1.60 2003/11/15 00:53:38 fmk Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "php.h" -#include "php_ming.h" +#include "php_globals.h" #include "ext/standard/info.h" #include "ext/standard/file.h" #include "ext/standard/fsock.h" @@ -32,6 +32,7 @@ #if HAVE_MING +#include "php_ming.h" #include #include #include @@ -69,6 +70,7 @@ static SWFMovieClip getSprite(zval *id TSRMLS_DC); static SWFSound getSound(zval *id TSRMLS_DC); #ifdef HAVE_NEW_MING +static SWFFontCharacter getFontCharacter(zval *id TSRMLS_DC); static SWFSoundInstance getSoundInstance(zval *id TSRMLS_DC); #endif @@ -3869,6 +3871,7 @@ INIT_CLASS_ENTRY(sprite_class_entry, "swfsprite", swfsprite_functions); INIT_CLASS_ENTRY(sound_class_entry, "swfsound", swfsound_functions); #ifdef HAVE_NEW_MING + INIT_CLASS_ENTRY(fontchar_class_entry, "swffontchar", swffontchar_functions); INIT_CLASS_ENTRY(soundinstance_class_entry, "swfsoundinstance", swfsoundinstance_functions); #endif @@ -3885,6 +3888,10 @@ action_class_entry_ptr = zend_register_internal_class(&action_class_entry TSRMLS_CC); morph_class_entry_ptr = zend_register_internal_class(&morph_class_entry TSRMLS_CC); sprite_class_entry_ptr = zend_register_internal_class(&sprite_class_entry TSRMLS_CC); +#ifdef HAVE_NEW_MING + fontchar_class_entry_ptr = zend_register_internal_class(&fontchar_class_entry TSRMLS_CC); + soundinstance_class_entry_ptr = zend_register_internal_class(&soundinstance_class_entry TSRMLS_CC); +#endif return SUCCESS; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ming ming.dsp
fmk Sat Nov 15 00:42:57 2003 EDT Modified files: /php-src/ext/ming ming.dsp Log: Fix win32 compilation. This will import the core_globals_id Index: php-src/ext/ming/ming.dsp diff -u php-src/ext/ming/ming.dsp:1.2 php-src/ext/ming/ming.dsp:1.3 --- php-src/ext/ming/ming.dsp:1.2 Wed Jan 22 15:13:09 2003 +++ php-src/ext/ming/ming.dsp Sat Nov 15 00:42:56 2003 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D "WIN32" /D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D "HAVE_MING" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D "WIN32" /D "MING_EXPORTS" /D "COMPILE_DL_MING" /D "HAVE_MING" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_MING" /D ZTS=1 /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "MING_EXPORTS" /D "COMPILE_DL_MING" /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_MING" /D ZTS=1 /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/ming ming.dsp
fmk Sat Nov 15 00:43:45 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/ming ming.dsp Log: MFH Fix win32 compilation. Index: php-src/ext/ming/ming.dsp diff -u php-src/ext/ming/ming.dsp:1.1.14.1 php-src/ext/ming/ming.dsp:1.1.14.2 --- php-src/ext/ming/ming.dsp:1.1.14.1 Wed Jan 22 15:12:45 2003 +++ php-src/ext/ming/ming.dsp Sat Nov 15 00:43:44 2003 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D "WIN32" /D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D "HAVE_MING" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D "WIN32" /D "MING_EXPORTS" /D "COMPILE_DL_MING" /D "HAVE_MING" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MING_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_MING" /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_MING" /D ZTS=1 /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I "..\..\..\bindlib_w32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "MING_EXPORTS" /D "COMPILE_DL_MING" /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_MING" /D ZTS=1 /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
