Re[3]: [PHP-CVS] cvs: php4 /main config.w32.h php_ini.c

2001-04-23 Thread Daniel Beulshausen 

Monday, April 23, 2001, 10:19:36 PM, you wrote:
 It should be the Program Files directory, concatenated with 'PHP';  Under
 Windows, we should behave like Windows apps...

we should use registry entries to determine/set the path(s), if those
entries aren't present it could default to some hardcoded values...

daniel

 Zeev

 At 21:50 23/4/2001, James Moore wrote:
how about defaulting to SystemDrive\\php4 but also allowing a envromental
variable to be set so

#define PHP_BINDIR (getenv(PHP_BinDir))?getenv(PHP_BinDir):c:\\php4

or somthing like that which works in C

- James

  -Original Message-
  From: Frank M. Kromann [mailto:[EMAIL PROTECTED]]
  Sent: 23 April 2001 19:24
  To: James Moore
  Cc: [EMAIL PROTECTED]
  Subject: Re: RE: [PHP-CVS] cvs: php4 /main config.w32.h php_ini.c
 
 
  Hi James,
 
  No problem. I change it to
 
  #define PHP_CONFIG_FILE_PATH getenv(SystemRoot)
 
  What about all the other directories ? These should be configureable too.
 
  - Frank
 
fmk   Mon Apr 23 10:33:22 2001 EDT
   
  Modified files:
/php4/mainconfig.w32.h php_ini.c
+
+/* Define directory constants for php and pear */
+#define PHP_BINDIR c:\\php4
+#define PHP_LIBDIR c:\\php4
+#define PHP_DATADIR c:\\php4
+#define PHP_SYSCONFDIR c:\\php4
+#define PHP_LOCALSTATEDIR c:\\php4
+#define PHP_CONFIG_FILE_PATH c:\\winnt
+#define PEAR_INSTALLDIR c:\\php4\\pear
  
   Ugh thats very very ugly.. I dont want my files there can you please use
   SYSROOT instead of c:\\winnt please.
  
   - James
  
  
  
   --
   PHP CVS Mailing List (http://www.php.net/)
   To unsubscribe, e-mail: [EMAIL PROTECTED]
   For additional commands, e-mail: [EMAIL PROTECTED]
   To contact the list administrators, e-mail: [EMAIL PROTECTED]
  
  
  
 
 
 
 
  --
  PHP CVS Mailing List (http://www.php.net/)
  To unsubscribe, e-mail: [EMAIL PROTECTED]
  For additional commands, e-mail: [EMAIL PROTECTED]
  To contact the list administrators, e-mail: [EMAIL PROTECTED]


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

ZS --
ZS Zeev Suraski [EMAIL PROTECTED]
ZS CTO   co-founder, Zend Technologies Ltd. http://www.zend.com/

/*--
daniel beulshausen - [EMAIL PROTECTED]
using php on windows? http://www.php4win.de



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/printer php_printer.h printer.c printer.php

2001-04-05 Thread Daniel Beulshausen 

dbeuThu Apr  5 05:36:01 2001 EDT

  Modified files:  
/php4/ext/printer   php_printer.h printer.c printer.php 
  Log:
  overhaul printer extension
  # documentation is nearly finished
  

Index: php4/ext/printer/php_printer.h
diff -u php4/ext/printer/php_printer.h:1.7 php4/ext/printer/php_printer.h:1.8
--- php4/ext/printer/php_printer.h:1.7  Sun Feb 25 22:07:13 2001
+++ php4/ext/printer/php_printer.h  Thu Apr  5 05:36:00 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_printer.h,v 1.7 2001/02/26 06:07:13 andi Exp $ */
+/* $Id: php_printer.h,v 1.8 2001/04/05 12:36:00 dbeu Exp $ */
 
 #ifndef PHP_PRINTER_H
 #define PHP_PRINTER_H
@@ -29,12 +29,11 @@
 
 PHP_MINIT_FUNCTION(printer);
 PHP_MINFO_FUNCTION(printer);
+PHP_MSHUTDOWN_FUNCTION(printer);
 
-
 PHP_FUNCTION(printer_open);
 PHP_FUNCTION(printer_close);
 PHP_FUNCTION(printer_write);
-PHP_FUNCTION(printer_name);
 PHP_FUNCTION(printer_list);
 PHP_FUNCTION(printer_set_option);
 PHP_FUNCTION(printer_get_option);
@@ -50,45 +49,36 @@
 PHP_FUNCTION(printer_create_brush);
 PHP_FUNCTION(printer_delete_brush);
 PHP_FUNCTION(printer_select_brush);
+PHP_FUNCTION(printer_create_font);
+PHP_FUNCTION(printer_delete_font);
+PHP_FUNCTION(printer_select_font);
 PHP_FUNCTION(printer_logical_fontheight);
 PHP_FUNCTION(printer_draw_roundrect);
 PHP_FUNCTION(printer_draw_rectangle);
 PHP_FUNCTION(printer_draw_text);
 PHP_FUNCTION(printer_draw_elipse);
-PHP_FUNCTION(printer_create_font);
-PHP_FUNCTION(printer_delete_font);
-PHP_FUNCTION(printer_select_font);
+PHP_FUNCTION(printer_draw_line);
+PHP_FUNCTION(printer_draw_chord);
+PHP_FUNCTION(printer_draw_pie);
+PHP_FUNCTION(printer_draw_bmp);
+PHP_FUNCTION(printer_abort);
 
-
 typedef struct {
HANDLE handle;
LPTSTR name;
LPDEVMODE device;
-   LPVOID data;
DOC_INFO_1 info1;
DOCINFO info;
HDC dc;
 } printer;
 
-typedef struct {
-   HPEN pointer;
-} pen_struct;
-
-typedef struct {
-   HBRUSH pointer;
-} brush_struct;
-
-typedef struct {
-   HFONT pointer;
-} font_struct;
-
 typedef struct {
-   int printer_id;
-} php_printer_globals;
+   char *default_printer;
+} zend_printer_globals;
 
 #ifdef ZTS
 #define PRINTERG(v) (printer_globals-v)
-#define PRINTERLS_FETCH() php_printer_globals *printer_globals = 
ts_resource(printer_globals_id)
+#define PRINTERLS_FETCH() zend_printer_globals *printer_globals = 
+ts_resource(printer_globals_id)
 #else
 #define PRINTERG(v) (printer_globals.v)
 #define PRINTERLS_FETCH()
Index: php4/ext/printer/printer.c
diff -u php4/ext/printer/printer.c:1.10 php4/ext/printer/printer.c:1.11
--- php4/ext/printer/printer.c:1.10 Tue Mar 13 06:24:25 2001
+++ php4/ext/printer/printer.c  Thu Apr  5 05:36:00 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: printer.c,v 1.10 2001/03/13 14:24:25 dbeu Exp $ */
+/* $Id: printer.c,v 1.11 2001/04/05 12:36:00 dbeu Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -32,54 +32,53 @@
 #ifdef ZTS
 int printer_globals_id;
 #else
-php_printer_globals printer_globals;
+zend_printer_globals printer_globals;
 #endif
 
 static int le_printer, le_brush, le_pen, le_font;
 
 #ifdef PHP_WIN32
-/* windows headers */
 #include windows.h
 #include wingdi.h
 #include winspool.h
 
-/* some protos */
-char *get_default_printer(void);
 COLORREF hex_to_rgb(char * hex);
-int get_pen_style(char *style);
-int get_hatch_style(char *hatch);
+char *rgb_to_hex(COLORREF rgb);
 static void destroy_ressources(zend_rsrc_list_entry *resource);
-DWORD _print_enumvalue(char * EnumStr);
-
+char *get_default_printer(void);
 
 function_entry printer_functions[] = {
-   PHP_FE(printer_open,NULL)
-   PHP_FE(printer_close,NULL)
-   PHP_FE(printer_write,NULL)
-   PHP_FE(printer_name,NULL)
-   PHP_FE(printer_list,NULL)
-   PHP_FE(printer_set_option,NULL)
-   PHP_FE(printer_get_option,NULL)
-   PHP_FE(printer_create_dc,NULL)
-   PHP_FE(printer_delete_dc,NULL)
-   PHP_FE(printer_start_doc,NULL)
-   PHP_FE(printer_end_doc,NULL)
-   PHP_FE(printer_start_page,NULL)
-   PHP_FE(printer_end_page,NULL)
-   PHP_FE(printer_create_pen,NULL)
-   PHP_FE(printer_delete_pen,NULL)
-   PHP_FE(printer_select_pen,NULL)
-   PHP_FE(printer_create_brush,NULL)
-   PHP_FE(printer_delete_brush,NULL)
-   PHP_FE(printer_select_brush,NULL)
-   PHP_FE(printer_logical_fontheight,NULL)
-   PHP_FE(printer_draw_roundrect,NULL)
-   PHP_FE(printer_draw_rectangle,NULL)
-   PHP_FE(printer_draw_text,NULL)
-   PHP_FE(printer_draw_elipse,NULL)
-   PHP_FE(printer_create_font,NULL)
-   PHP_FE(printer_delete_font,NULL)
-   PHP_FE(printer_select_font,NULL)
+   PHP_FE(printer_open,

[PHP-CVS] cvs: php4 /ext/exif exif.c

2001-04-03 Thread Daniel Beulshausen 

dbeuTue Apr  3 14:39:18 2001 EDT

  Modified files:  
/php4/ext/exif  exif.c 
  Log:
  resolve realpath if in v-dir mode
  
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.12 php4/ext/exif/exif.c:1.13
--- php4/ext/exif/exif.c:1.12   Sun Feb 25 22:06:54 2001
+++ php4/ext/exif/exif.cTue Apr  3 14:39:18 2001
@@ -1060,7 +1060,7 @@
 pval **p_name;
 int ac = ZEND_NUM_ARGS(), ret;
ImageInfoType ImageInfo;
-   char tmp[64];
+   char tmp[64], *file;
 
/*ImageInfo.Thumbnail = NULL;
ImageInfo.ThumbnailSize = 0;
@@ -1070,7 +1070,14 @@
WRONG_PARAM_COUNT;
 
convert_to_string_ex(p_name);
-   ret = php_read_jpeg_exif(ImageInfo, (*p_name)-value.str.val,1);
+
+#ifdef VIRTUAL_DIR
+   virtual_filepath(Z_STRVAL_PP(p_name), file);
+   ret = php_read_jpeg_exif(ImageInfo, file,1);
+#else
+   ret = php_read_jpeg_exif(ImageInfo, Z_STRVAL_PP(p_name),1);
+#endif
+
if (array_init(return_value) == FAILURE) {
RETURN_FALSE;
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 / NEWS

2001-03-23 Thread Daniel Beulshausen 

dbeuFri Mar 23 00:33:23 2001 EDT

  Modified files:  
/php4   NEWS 
  Log:
  update news
  
Index: php4/NEWS
diff -u php4/NEWS:1.619 php4/NEWS:1.620
--- php4/NEWS:1.619 Thu Mar 22 18:09:21 2001
+++ php4/NEWS   Fri Mar 23 00:33:22 2001
@@ -2,6 +2,7 @@
 |||
 
 ?? ??? 200?, Version 4.0.6
+- Added support for UNC style paths (\\server\share\file  //server/share/file) 
+(Daniel, TSRM)
 - Changed C++ style comments to C-style comments (Marc)
 - Added dbx module (database abstraction) to the repository. (Marc)
 - Using ITypeInfo instead of IDispatch if possible. This makes DCOM calls



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /win32 registry.c

2001-03-20 Thread Daniel Beulshausen 

dbeuTue Mar 20 07:44:55 2001 EDT

  Modified files:  
/php4/win32 registry.c 
  Log:
  fix registry per directory values
  # they never really worked for me before
  
Index: php4/win32/registry.c
diff -u php4/win32/registry.c:1.8 php4/win32/registry.c:1.9
--- php4/win32/registry.c:1.8   Sun Oct 29 03:38:26 2000
+++ php4/win32/registry.c   Tue Mar 20 07:44:55 2001
@@ -1,10 +1,6 @@
 #include "php.h"
 #include "php_ini.h"
-#include "php_registry.h"
 
-#define MAX_NAMEBUF_LEN512
-#define MAX_VALUE_LEN  512
-
 void UpdateIniFromRegistry(char *path)
 {
char *p, *orig_path;
@@ -53,23 +49,36 @@
 
while (p) {
HKEY hKey;
-   char namebuf[MAX_NAMEBUF_LEN], valuebuf[MAX_VALUE_LEN];
DWORD lType;
-   DWORD namebuf_length=MAX_NAMEBUF_LEN, valuebuf_length=MAX_VALUE_LEN;
-   DWORD i=0;
-
+   DWORD values = 0, max_name = 0, max_value = 0, i = 0;
+   
if (ppath) {
*(p-1) = '\\'; /* restore the slash */
}
+
if (RegOpenKeyEx(MainKey, path, 0, KEY_READ, hKey)!=ERROR_SUCCESS) {
break;
}
-   while (RegEnumValue(hKey, i++, namebuf, namebuf_length, NULL, lType, 
valuebuf, valuebuf_length)==ERROR_SUCCESS) {
-   if (lType != REG_SZ) {
-   continue;
+
+   if(RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, values, 
+max_name, max_value, NULL, NULL) == ERROR_SUCCESS) {
+   LPTSTR namebuf = (LPTSTR)emalloc(max_name + 1);
+   PBYTE valuebuf = (PBYTE)emalloc(max_value);
+
+   while (i  values) {
+   DWORD namebuf_len  = max_name + 1;
+   DWORD valuebuf_len = max_value;
+
+   RegEnumValue(hKey, i, namebuf, namebuf_len, NULL, 
+lType, valuebuf, valuebuf_len);
+
+   if ((lType == REG_SZ) || (lType == REG_EXPAND_SZ)) {
+   zend_alter_ini_entry(namebuf, namebuf_len + 1, 
+valuebuf, valuebuf_len, PHP_INI_PERDIR, PHP_INI_STAGE_ACTIVATE);
+   }
+
+   i++;
}
-   /*printf("%s - %s\n", namebuf, valuebuf);*/
-   zend_alter_ini_entry(namebuf, namebuf_length+1, valuebuf, 
valuebuf_length+1, PHP_INI_PERDIR, PHP_INI_STAGE_ACTIVATE);
+
+   efree(namebuf);
+   efree(valuebuf);
}
 
RegCloseKey(hKey);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/pgsql pgsql.dsp

2001-03-20 Thread Daniel Beulshausen 

dbeuTue Mar 20 09:45:11 2001 EDT

  Modified files:  
/php4/ext/pgsql pgsql.dsp 
  Log:
  fix dsp
  
Index: php4/ext/pgsql/pgsql.dsp
diff -u php4/ext/pgsql/pgsql.dsp:1.16 php4/ext/pgsql/pgsql.dsp:1.17
--- php4/ext/pgsql/pgsql.dsp:1.16   Thu Sep 28 13:25:03 2000
+++ php4/ext/pgsql/pgsql.dspTue Mar 20 09:45:10 2001
@@ -45,7 +45,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 "PGSQL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I 
"D:\Projects\php_build\postgresql\src\interfaces\libpq" /I 
"..\..\..\php_build\PostgreSQL\src\include" /I "..\.." /I "..\..\main" /I "..\..\Zend" 
/I "..\..\..\php_build\postgresql\src\interfaces\libpq" /I "..\..\..\bindlib_w32" /D 
"NDEBUG" /D "PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D 
"ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_PGSQL" /D HAVE_PGSQL=1 /D ZEND_DEBUG=0 /FD 
/c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I 
+"D:\Projects\php_build\postgresql\src\interfaces\libpq" /I 
+"..\..\..\php_build\PostgreSQL\src\include" /I "..\.." /I "..\..\main" /I 
+"..\..\Zend" /I "..\..\..\php_build\postgresql\src\interfaces\libpq" /I 
+"..\..\..\bindlib_w32" /D "NDEBUG" /D "PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D 
+"_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_PGSQL" /D 
+HAVE_PGSQL=1 /D ZEND_DEBUG=0 /D "HAVE_PQCMDTUPLES" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +72,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 "PGSQL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I 
"D:\Projects\php_build\postgresql\src\interfaces\libpq" /I 
"..\..\..\php_build\PostgreSQL\src\include" /I "..\.." /I "..\..\main" /I "..\..\Zend" 
/I "..\..\..\php_build\postgresql\src\interfaces\libpq" /I "..\..\..\bindlib_w32" /D 
"_DEBUG" /D "PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D 
"ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_PGSQL" /D HAVE_PGSQL=1 /D ZEND_DEBUG=1 /YX 
/FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I 
+"D:\Projects\php_build\postgresql\src\interfaces\libpq" /I 
+"..\..\..\php_build\PostgreSQL\src\include" /I "..\.." /I "..\..\main" /I 
+"..\..\Zend" /I "..\..\..\php_build\postgresql\src\interfaces\libpq" /I 
+"..\..\..\bindlib_w32" /D "_DEBUG" /D "PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D 
+"_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_PGSQL" /D 
+HAVE_PGSQL=1 /D ZEND_DEBUG=1 /D "HAVE_PQCMDTUPLES" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -100,7 +100,7 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I 
"..\..\..\PostgreSQL\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "ZTS" /D 
"PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D 
"PHP_WIN32" /D "COMPILE_DL_PGSQL" /D HAVE_PGSQL=1 /D ZTS=1 /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I 
"..\..\..\php_build\postgresql\src\interfaces\libpq" /I 
"..\..\..\php_build\PostgreSQL\src\include" /I "..\.." /I "..\..\main" /I "..\..\Zend" 
/I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "NDEBUG" /D "ZTS" /D "PGSQL_EXPORTS" /D 
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D 
"COMPILE_DL_PGSQL" /D HAVE_PGSQL=1 /D ZEND_DEBUG=0 /FR /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I 
+"..\..\..\php_build\postgresql\src\interfaces\libpq" /I 
+"..\..\..\php_build\PostgreSQL\src\include" /I "..\.." /I "..\..\main" /I 
+"..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "NDEBUG" /D "ZTS" /D 
+"PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D 
+"PHP_WIN32" /D "COMPILE_DL_PGSQL" /D HAVE_PGSQL=1 /D ZEND_DEBUG=0 /D 
+"HAVE_PQCMDTUPLES" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -127,7 +127,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "PGSQL_EXPORTS" /D 
"WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D 
"COMPILE_DL_PGSQL" /D HAVE_PGSQL=1 /D ZTS=1 /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I 
"D:\Projects\php_build\postgresql\src\interfaces\libpq" /I 
"..\..\..\php_build\PostgreSQL\src\include" /I "..\.." /I "..\..\main" /I "..\..\Zend" 
/I "..\..\..\php_build\postgresql\src\interfaces\libpq" /I "..\..\..\bindlib_w32" /I 
"..\..\TSRM" /D "_DEBUG" /D "PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D 
"_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_PGSQL" /D HAVE_PGSQL=1

[PHP-CVS] cvs: php4 /win32 php4ts.dsw

2001-03-17 Thread Daniel Beulshausen 

dbeuSat Mar 17 04:30:28 2001 EDT

  Modified files:  
/php4/win32 php4ts.dsw 
  Log:
  fix dependencys
  
Index: php4/win32/php4ts.dsw
diff -u php4/win32/php4ts.dsw:1.6 php4/win32/php4ts.dsw:1.7
--- php4/win32/php4ts.dsw:1.6   Thu Nov 23 06:34:09 2000
+++ php4/win32/php4ts.dsw   Sat Mar 17 04:30:27 2001
@@ -3,7 +3,7 @@
 
 ###
 
-Project: "TSRM"=..\TSRM\TSRM.dsp - Package Owner=4
+Project: "TSRM"="..\TSRM\TSRM.dsp" - Package Owner=4
 
 Package=5
 {{{
@@ -15,7 +15,7 @@
 
 ###
 
-Project: "ZendTS"=..\Zend\ZendTS.dsp - Package Owner=4
+Project: "ZendTS"="..\Zend\ZendTS.dsp" - Package Owner=4
 
 Package=5
 {{{
@@ -30,7 +30,7 @@
 
 ###
 
-Project: "libmysql"=..\ext\mysql\libmysql\libmysql.dsp - Package Owner=4
+Project: "libmysql"="..\ext\mysql\libmysql\libmysql.dsp" - Package Owner=4
 
 Package=5
 {{{
@@ -42,7 +42,7 @@
 
 ###
 
-Project: "php4aolserver"=..\sapi\aolserver\php4aolserver.dsp - Package Owner=4
+Project: "php4aolserver"="..\sapi\aolserver\php4aolserver.dsp" - Package Owner=4
 
 Package=5
 {{{
@@ -57,7 +57,7 @@
 
 ###
 
-Project: "php4apache"=..\sapi\apache\php4apache.dsp - Package Owner=4
+Project: "php4apache"="..\sapi\apache\php4apache.dsp" - Package Owner=4
 
 Package=5
 {{{
@@ -72,7 +72,7 @@
 
 ###
 
-Project: "php4dllts"=.\php4dllts.dsp - Package Owner=4
+Project: "php4dllts"=".\php4dllts.dsp" - Package Owner=4
 
 Package=5
 {{{
@@ -84,19 +84,16 @@
 Project_Dep_Name ZendTS
 End Project Dependency
 Begin Project Dependency
-Project_Dep_Name TSRM
-End Project Dependency
-Begin Project Dependency
 Project_Dep_Name libmysql
 End Project Dependency
 Begin Project Dependency
-Project_Dep_Name bindlib
+Project_Dep_Name TSRM
 End Project Dependency
 }}}
 
 ###
 
-Project: "php4isapi"=..\sapi\isapi\php4isapi.dsp - Package Owner=4
+Project: "php4isapi"="..\sapi\isapi\php4isapi.dsp" - Package Owner=4
 
 Package=5
 {{{
@@ -111,7 +108,7 @@
 
 ###
 
-Project: "php4nsapi"=..\sapi\nsapi\php4nsapi.dsp - Package Owner=4
+Project: "php4nsapi"="..\sapi\nsapi\php4nsapi.dsp" - Package Owner=4
 
 Package=5
 {{{
@@ -126,7 +123,7 @@
 
 ###
 
-Project: "php4ts"=.\php4ts.dsp - Package Owner=4
+Project: "php4ts"=".\php4ts.dsp" - Package Owner=4
 
 Package=5
 {{{
@@ -137,14 +134,11 @@
 Begin Project Dependency
 Project_Dep_Name php4dllts
 End Project Dependency
-Begin Project Dependency
-Project_Dep_Name mysql
-End Project Dependency
 }}}
 
 ###
 
-Project: "servlet"=..\sapi\servlet\servlet.dsp - Package Owner=4
+Project: "servlet"="..\sapi\servlet\servlet.dsp" - Package Owner=4
 
 Package=5
 {{{



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /main reentrancy.c

2001-03-13 Thread Daniel Beulshausen 

dbeuTue Mar 13 03:09:37 2001 EDT

  Modified files:  
/php4/main  reentrancy.c 
  Log:
  fix bug in php_gmtime_r
  
Index: php4/main/reentrancy.c
diff -u php4/main/reentrancy.c:1.25 php4/main/reentrancy.c:1.26
--- php4/main/reentrancy.c:1.25 Sun Feb 25 22:07:31 2001
+++ php4/main/reentrancy.c  Tue Mar 13 03:09:37 2001
@@ -205,11 +205,14 @@
local_lock(GMTIME_R);
 
tmp = gmtime(timep);
-   memcpy(p_tm, tmp, sizeof(struct tm));
+   if (tmp) {
+   memcpy(p_tm, tmp, sizeof(struct tm));
+   tmp = p_tm;
+   }

local_unlock(GMTIME_R);
 
-   return p_tm;
+   return tmp;
 }
 
 #endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/printer printer.c

2001-03-13 Thread Daniel Beulshausen 

dbeuTue Mar 13 06:24:26 2001 EDT

  Modified files:  
/php4/ext/printer   printer.c 
  Log:
  nuke alot unnecessary globals fetches
  
Index: php4/ext/printer/printer.c
diff -u php4/ext/printer/printer.c:1.9 php4/ext/printer/printer.c:1.10
--- php4/ext/printer/printer.c:1.9  Sun Feb 25 22:07:13 2001
+++ php4/ext/printer/printer.c  Tue Mar 13 06:24:25 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: printer.c,v 1.9 2001/02/26 06:07:13 andi Exp $ */
+/* $Id: printer.c,v 1.10 2001/03/13 14:24:25 dbeu Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -106,7 +106,7 @@
php_info_print_table_row(2, "Printer Support", "enabled");
php_info_print_table_row(2, "Default printing device", default_printer ? 
default_printer : "bnot detected/b");
php_info_print_table_row(2, "Module state", "experimental");
-   php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.9 2001/02/26 
06:07:13 andi Exp $");
+   php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.10 2001/03/13 
+14:24:25 dbeu Exp $");
php_info_print_table_end();
 }
 
@@ -127,8 +127,6 @@
pval **arg1;
printer *resource;
 
-   PRINTERLS_FETCH();
-
resource = (printer *)emalloc(sizeof(printer));
 
/* use the given printer */
@@ -170,8 +168,6 @@
pval **arg1;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if ( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -198,8 +194,6 @@
LPDWORD recieved = NULL;
int sd, sp = 0;
 
-   PRINTERLS_FETCH();
-
if ( zend_get_parameters_ex(2, arg1, arg2) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -238,8 +232,6 @@
pval **arg1;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if ( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -361,8 +353,6 @@
pval **arg1, **arg2, **arg3;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(3, arg1, arg2, arg3) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -431,8 +421,6 @@
pval **arg1, **arg2;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(2, arg1, arg2) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -491,8 +479,6 @@
pval **arg1;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -516,8 +502,6 @@
pval **arg1;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -543,8 +527,6 @@
pval **arg1;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -568,8 +550,6 @@
pval **arg1;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -593,8 +573,6 @@
pval **arg1;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -618,8 +596,6 @@
pval **arg1;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -643,8 +619,6 @@
pval **arg1, **arg2, **arg3;
pen_struct *pen = emalloc(sizeof(pen_struct));
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(3, arg1, arg2, arg3) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -667,8 +641,6 @@
pval **arg1;
pen_struct *pen;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -688,8 +660,6 @@
pen_struct *pen;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(2, arg1, arg2) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -709,8 +679,6 @@
pval **arg1, **arg2;
brush_struct *brush = emalloc(sizeof(brush_struct));
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(2, arg1, arg2) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -736,8 +704,6 @@
 {
pval **arg1;
brush_struct *brush;
-   
-   PRINTERLS_FETCH();
 
if( zend_get_parameters_ex(1, arg1) == FAILURE ) {
WRONG_PARAM_COUNT;
@@ -758,8 +724,6 @@
brush_struct *brush;
printer *resource;
 
-   PRINTERLS_FETCH();
-
if( zend_get_parameters_ex(2, arg1, arg2) == FAILURE ) {

[PHP-CVS] cvs: php4 /ext/zlib zlib.c

2001-03-07 Thread Daniel Beulshausen 

dbeuWed Mar  7 09:23:31 2001 EDT

  Modified files:  
/php4/ext/zlib  zlib.c 
  Log:
  add missing globals fetches
  
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.75 php4/ext/zlib/zlib.c:1.76
--- php4/ext/zlib/zlib.c:1.75   Tue Mar  6 12:43:54 2001
+++ php4/ext/zlib/zlib.cWed Mar  7 09:23:30 2001
@@ -16,7 +16,7 @@
|  Stefan Röhrich [EMAIL PROTECTED]|
+--+
  */
-/* $Id: zlib.c,v 1.75 2001/03/06 20:43:54 zeev Exp $ */
+/* $Id: zlib.c,v 1.76 2001/03/07 17:23:30 dbeu Exp $ */
 #define IS_EXT_MODULE
 
 #include "php.h"
@@ -1118,6 +1118,7 @@
zval **data, **a_encoding;
zend_bool return_original=0;
zend_bool do_start, do_end;
+   ZLIBLS_FETCH();
 
if (ZEND_NUM_ARGS()!=2 || zend_get_parameters_ex(2, zv_string, 
zv_mode)==FAILURE) {
ZEND_WRONG_PARAM_COUNT();
@@ -1206,6 +1207,8 @@
 int php_enable_output_compression(int buffer_size)
 {
zval **a_encoding, **data;
+   ELS_FETCH();
+   ZLIBLS_FETCH();
 
if (zend_hash_find(EG(symbol_table), "HTTP_SERVER_VARS", 
sizeof("HTTP_SERVER_VARS"), (void **) data)==FAILURE
|| Z_TYPE_PP(data)!=IS_ARRAY



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /main php.h

2001-02-26 Thread Daniel Beulshausen 

dbeuMon Feb 26 08:32:57 2001 EDT

  Modified files:  
/php4/main  php.h 
  Log:
  nuke warnings
  
Index: php4/main/php.h
diff -u php4/main/php.h:1.132 php4/main/php.h:1.133
--- php4/main/php.h:1.132   Sun Feb 25 22:07:31 2001
+++ php4/main/php.h Mon Feb 26 08:32:57 2001
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php.h,v 1.132 2001/02/26 06:07:31 andi Exp $ */
+/* $Id: php.h,v 1.133 2001/02/26 16:32:57 dbeu Exp $ */
 
 #ifndef PHP_H
 #define PHP_H
@@ -41,11 +41,6 @@
 #define sprintf php_sprintf
 #endif
 
-extern unsigned char first_arg_force_ref[];   
-extern unsigned char first_arg_allow_ref[];
-extern unsigned char second_arg_force_ref[];
-extern unsigned char second_arg_allow_ref[];
-
 #ifdef PHP_WIN32
 #include "win95nt.h"
 #  ifdef PHP_EXPORTS
@@ -59,6 +54,11 @@
 #define THREAD_LS
 #define PHP_DIR_SEPARATOR '/'
 #endif
+
+PHPAPI extern unsigned char first_arg_force_ref[];
+PHPAPI extern unsigned char first_arg_allow_ref[];
+PHPAPI extern unsigned char second_arg_force_ref[];
+PHPAPI extern unsigned char second_arg_allow_ref[];
 
 #include "php_regex.h"
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/zlib zlib.dsp

2001-02-20 Thread Daniel Beulshausen 

dbeuTue Feb 20 07:05:37 2001 EDT

  Modified files:  
/php4/ext/zlib  zlib.dsp 
  Log:
  changed zlibstat.lib - zlib.lib, which is the correct name
  
Index: php4/ext/zlib/zlib.dsp
diff -u php4/ext/zlib/zlib.dsp:1.11 php4/ext/zlib/zlib.dsp:1.12
--- php4/ext/zlib/zlib.dsp:1.11 Thu Aug 24 10:48:30 2000
+++ php4/ext/zlib/zlib.dsp  Tue Feb 20 07:05:37 2001
@@ -54,7 +54,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
php4ts.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib 
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib 
zlibstat.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_zlib.dll" 
/libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\zlib\Release" 
/libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib 
+shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib 
+zlib.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_zlib.dll" 
+/libpath:"..\..\Release_TS" /libpath:"..\..\..\php_build\zlib\Release" 
+/libpath:"..\..\Release_TS_Inline"
 
 !ELSEIF  "$(CFG)" == "zlib - Win32 Debug_TS"
 
@@ -81,7 +81,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
php4ts_debug.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib 
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib 
zlibstat.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_zlib.dll" 
/libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\zlib\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib 
+shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib 
+zlib.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/php_zlib.dll" 
+/libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\zlib\Debug"
 
 !ENDIF 
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/swf swf.dsp /win32 php_modules.dsw

2001-02-20 Thread Daniel Beulshausen 

dbeuTue Feb 20 07:15:10 2001 EDT

  Removed files:   
/php4/ext/swf   swf.dsp 

  Modified files:  
/php4/win32 php_modules.dsw 
  Log:
  no swf under win32
  
Index: php4/win32/php_modules.dsw
diff -u php4/win32/php_modules.dsw:1.36 php4/win32/php_modules.dsw:1.37
--- php4/win32/php_modules.dsw:1.36 Wed Jan 31 09:12:12 2001
+++ php4/win32/php_modules.dsw  Tue Feb 20 07:15:10 2001
@@ -435,18 +435,6 @@
 
 ###
 
-Project: "swf"=..\ext\swf\swf.dsp - Package Owner=4
-
-Package=5
-{{{
-}}}
-
-Package=4
-{{{
-}}}
-
-###
-
 Project: "sybase_ct"=..\ext\sybase_ct\sybase_ct.dsp - Package Owner=4
 
 Package=5



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/iconv iconv.dsp

2001-02-20 Thread Daniel Beulshausen 

dbeuTue Feb 20 07:19:38 2001 EDT

  Modified files:  
/php4/ext/iconv iconv.dsp 
  Log:
  define HAVE_LIBICONV
  
Index: php4/ext/iconv/iconv.dsp
diff -u php4/ext/iconv/iconv.dsp:1.1 php4/ext/iconv/iconv.dsp:1.2
--- php4/ext/iconv/iconv.dsp:1.1Wed Jan 31 08:57:00 2001
+++ php4/ext/iconv/iconv.dspTue Feb 20 07:19:38 2001
@@ -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 "ICONV_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I 
"..\..\main" /I "..\..\win32" /D "WIN32" /D "PHP_EXPORTS" /D "COMPILE_DL_ICONV" /D 
"HAVE_ICONV" /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" /D "WIN32" /D "PHP_EXPORTS" /D "COMPILE_DL_ICONV" /D 
+"HAVE_ICONV" /D ZEND_DEBUG=0 /D "NDEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "PHP_WIN32" 
+/D ZTS=1 /D "HAVE_LIBICONV" /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 "ICONV_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" 
/I "..\..\main" /I "..\..\win32" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" 
/D "PHP_EXPORTS" /D "COMPILE_DL_ICONV" /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_ICONV" 
/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" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" 
+/D "PHP_EXPORTS" /D "COMPILE_DL_ICONV" /D "ZEND_WIN32" /D "PHP_WIN32" /D "HAVE_ICONV" 
+/D ZTS=1 /D "HAVE_LIBICONV" /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, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/pgsql pgsql.c

2001-02-20 Thread Daniel Beulshausen 

dbeuTue Feb 20 07:34:11 2001 EDT

  Modified files:  
/php4/ext/pgsql pgsql.c 
  Log:
  added missing ELS_FETCH()
  
Index: php4/ext/pgsql/pgsql.c
diff -u php4/ext/pgsql/pgsql.c:1.91 php4/ext/pgsql/pgsql.c:1.92
--- php4/ext/pgsql/pgsql.c:1.91 Mon Feb 19 08:31:17 2001
+++ php4/ext/pgsql/pgsql.c  Tue Feb 20 07:34:10 2001
@@ -17,7 +17,7 @@
+--+
  */
  
-/* $Id: pgsql.c,v 1.91 2001/02/19 16:31:17 sas Exp $ */
+/* $Id: pgsql.c,v 1.92 2001/02/20 15:34:10 dbeu Exp $ */
 
 #include stdlib.h
 
@@ -239,8 +239,8 @@
 
 PHP_RSHUTDOWN_FUNCTION(pgsql)
 {
+   ELS_FETCH();
zend_hash_apply(EG(persistent_list), (apply_func_t) _rollback_transactions);
-
return SUCCESS;
 }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/standard fsock.c fsock.h

2001-02-20 Thread Daniel Beulshausen 

dbeuTue Feb 20 12:34:14 2001 EDT

  Modified files:  
/php4/ext/standard  fsock.c fsock.h 
  Log:
  make socket functions available to the outside
  
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.62 php4/ext/standard/fsock.c:1.63
--- php4/ext/standard/fsock.c:1.62  Sun Feb 18 10:54:41 2001
+++ php4/ext/standard/fsock.c   Tue Feb 20 12:34:13 2001
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: fsock.c,v 1.62 2001/02/18 18:54:41 thies Exp $ */
+/* $Id: fsock.c,v 1.63 2001/02/20 20:34:13 dbeu Exp $ */
 
 /* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */
 /* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */
@@ -101,7 +101,7 @@
 /*
  * Converts a host name to an IP address.
  */
-int lookup_hostname(const char *addr, struct in_addr *in)
+PHPAPI int lookup_hostname(const char *addr, struct in_addr *in)
 {
struct hostent *host_info;
 
@@ -119,7 +119,7 @@
 /* }}} */
 /* {{{ php_is_persistent_sock */
 
-int php_is_persistent_sock(int sock)
+PHPAPI int php_is_persistent_sock(int sock)
 {
char *key;
FLS_FETCH();
@@ -371,7 +371,7 @@
FG(phpsockbuf) = sock-next; \
pefree(sock, sock-persistent)
 
-void php_cleanup_sockbuf(int persistent FLS_DC)
+PHPAPI void php_cleanup_sockbuf(int persistent FLS_DC)
 {
php_sockbuf *now, *next;
 
@@ -429,7 +429,7 @@
return sock;
 }
 
-size_t php_sock_set_def_chunk_size(size_t size)
+PHPAPI size_t php_sock_set_def_chunk_size(size_t size)
 {
size_t old;
FLS_FETCH();
@@ -442,7 +442,7 @@
return old;
 }
 
-int php_sockdestroy(int socket)
+PHPAPI int php_sockdestroy(int socket)
 {
int ret = 0;
php_sockbuf *sock;
@@ -469,7 +469,7 @@
 
 #define SOCK_CLOSE(s) shutdown(s, 0); closesocket(s)
 
-int php_sock_close(int socket)
+PHPAPI int php_sock_close(int socket)
 {
int ret = 0;
php_sockbuf *sock;
@@ -579,7 +579,7 @@
return nr_read;
 }
 
-int php_sockset_blocking(int socket, int mode)
+PHPAPI int php_sockset_blocking(int socket, int mode)
 {
int old;
SOCK_FIND(sock, socket);
@@ -591,7 +591,7 @@
return old;
 }
 
-void php_sockset_timeout(int socket, struct timeval *timeout)
+PHPAPI void php_sockset_timeout(int socket, struct timeval *timeout)
 {
SOCK_FIND(sock, socket);
 
@@ -606,7 +606,7 @@
 /*
  * FIXME: fgets depends on '\n' as line delimiter
  */
-char *php_sock_fgets(char *buf, size_t maxlen, int socket)
+PHPAPI char *php_sock_fgets(char *buf, size_t maxlen, int socket)
 {
char *p = NULL;
char *ret = NULL;
@@ -665,7 +665,7 @@
  * [EMAIL PROTECTED] 19990528
  */
 
-int php_sock_fgetc(int socket)
+PHPAPI int php_sock_fgetc(int socket)
 {
int ret = EOF;
SOCK_FIND_AND_READ_MAX(1);
@@ -678,7 +678,7 @@
return ret;
 }
 
-int php_sock_feof(int socket)
+PHPAPI int php_sock_feof(int socket)
 {
int ret = 0;
SOCK_FIND(sock, socket);
@@ -694,7 +694,7 @@
 
 /* {{{ php_sock_fread() */
 
-size_t php_sock_fread(char *ptr, size_t size, int socket)
+PHPAPI size_t php_sock_fread(char *ptr, size_t size, int socket)
 {
size_t ret = 0;
SOCK_FIND_AND_READ_MAX(size);
@@ -715,7 +715,7 @@
 /* {{{ module start/shutdown functions */
 
/* {{{ php_msock_destroy */
-void php_msock_destroy(int *data)
+PHPAPI void php_msock_destroy(int *data)
 {
close(*data);
 }
Index: php4/ext/standard/fsock.h
diff -u php4/ext/standard/fsock.h:1.31 php4/ext/standard/fsock.h:1.32
--- php4/ext/standard/fsock.h:1.31  Sat Jan 13 15:49:44 2001
+++ php4/ext/standard/fsock.h   Tue Feb 20 12:34:14 2001
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: fsock.h,v 1.31 2001/01/13 23:49:44 zeev Exp $ */
+/* $Id: fsock.h,v 1.32 2001/02/20 20:34:14 dbeu Exp $ */
 
 /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */
 
@@ -70,19 +70,19 @@
 PHP_FUNCTION(fsockopen);
 PHP_FUNCTION(pfsockopen);
 
-int lookup_hostname(const char *addr, struct in_addr *in);
-char *php_sock_fgets(char *buf, size_t maxlen, int socket);
-size_t php_sock_fread(char *buf, size_t maxlen, int socket);
-int php_sock_feof(int socket);
-int php_sock_fgetc(int socket);
-int php_is_persistent_sock(int);
-int php_sockset_blocking(int socket, int mode);
-void php_sockset_timeout(int socket, struct timeval *timeout);
-int php_sockdestroy(int socket);
-int php_sock_close(int socket);
-size_t php_sock_set_def_chunk_size(size_t size);
-void php_msock_destroy(int *data);
-void php_cleanup_sockbuf(int persistent FLS_DC);
+PHPAPI int lookup_hostname(const char *addr, struct in_addr *in);
+PHPAPI char *php_sock_fgets(char *buf, size_t maxlen, int socket);
+PHPAPI size_t php_sock_fread(char *buf, size_t maxlen, int socket);
+PHPAPI int php_sock_feof(int socket);
+PHPAPI int php_sock_fgetc(int socket);
+PHPAPI int php_is_persistent_sock(int);

[PHP-CVS] cvs: php4 /ext/iconv iconv.c iconv.dsp

2001-01-31 Thread Daniel Beulshausen 

dbeuWed Jan 31 08:57:00 2001 EDT

  Added files: 
/php4/ext/iconv iconv.dsp 

  Modified files:  
/php4/ext/iconv iconv.c 
  Log:
  make iconv compile under win32 using libiconv
  # http://clisp.cons.org/~haible/packages-libiconv.html
  
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.4 php4/ext/iconv/iconv.c:1.5
--- php4/ext/iconv/iconv.c:1.4  Sat Jan 13 23:40:16 2001
+++ php4/ext/iconv/iconv.c  Wed Jan 31 08:57:00 2001
@@ -18,16 +18,27 @@
  */
 
 #include "php.h"
-#include "php_config.h"
 
 #if HAVE_ICONV
 
 #include "php_ini.h"
 #include "php_iconv.h"
+#include "ext/standard/info.h"
 
 
 ZEND_DECLARE_MODULE_GLOBALS(iconv)
 
+#if HAVE_LIBICONV
+#define icv_open(a,b) libiconv_open(a,b)
+#define icv_close(a) libiconv_close(a)
+#define icv(a,b,c,d,e) libiconv(a,b,c,d,e)
+#else
+#define icv_open(a,b) iconv_open(a,b)
+#define icv_close(a) iconv_close(a)
+#define icv(a,b,c,d,e) iconv(a,b,c,d,e)
+#endif
+
+
 /* True global resources - no need for thread safety here */
 static int le_iconv;
 
@@ -68,6 +79,7 @@
 
 PHP_MINIT_FUNCTION(iconv)
 {
+   ZEND_INIT_MODULE_GLOBALS(iconv, NULL, NULL);
REGISTER_INI_ENTRIES();
return SUCCESS;
 }
@@ -101,7 +113,7 @@
*out = out_buffer;
 out_p = out_buffer;
   
-cd = iconv_open(out_charset, in_charset);
+cd = icv_open(out_charset, in_charset);
   
if (cd == (iconv_t)(-1)) {
php_error(E_WARNING, "iconv: cannot convert from `%s' to `%s'",
@@ -110,7 +122,7 @@
return -1;
}

-   result = iconv(cd, (const char **) in_p, in_size, (char **)
+   result = icv(cd, (const char **) in_p, in_size, (char **)
   out_p, out_size);
 
 if (result == (size_t)(-1)) {
@@ -118,10 +130,11 @@
return -1;
 }
 
-iconv_close(cd);
+icv_close(cd);
 
 return SUCCESS;
 }
+
 
 /* {{{ proto string iconv(string in_charset, string out_charset, string str)
Returns str converted to the out_charset character set */

Index: php4/ext/iconv/iconv.dsp
+++ php4/ext/iconv/iconv.dsp
# Microsoft Developer Studio Project File - Name="iconv" - Package Owner=4
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

CFG=iconv - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "iconv.mak".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "iconv.mak" CFG="iconv - Win32 Debug_TS"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "iconv - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "iconv - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "iconv - Win32 Release_TS"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release_TS"
# PROP BASE Intermediate_Dir "Release_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release_TS"
# PROP Intermediate_Dir "Release_TS"
# 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 "ICONV_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM" /I 
"..\..\main" /I "..\..\win32" /D "WIN32" /D "PHP_EXPORTS" /D "COMPILE_DL_ICONV" /D 
"HAVE_ICONV" /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"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /machine:I386
# ADD LINK32 php4ts.lib iconv.lib kernel32.lib user32.lib gdi32.lib winspool.lib 
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_iconv.dll" 
/libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"

!ELSEIF  "$(CFG)" == "iconv - Win32 Debug_TS"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug_TS"
# PROP BASE Intermediate_Dir "Debug_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug_TS"
# PROP Intermediate_Dir "Debug_TS"
# PROP

[PHP-CVS] cvs: php4 /ext/pdf pdf.c

2001-01-31 Thread Daniel Beulshausen 

dbeuWed Jan 31 09:00:10 2001 EDT

  Modified files:  
/php4/ext/pdf   pdf.c 
  Log:
  fix typo
  
Index: php4/ext/pdf/pdf.c
diff -u php4/ext/pdf/pdf.c:1.67 php4/ext/pdf/pdf.c:1.68
--- php4/ext/pdf/pdf.c:1.67 Fri Jan 26 10:52:37 2001
+++ php4/ext/pdf/pdf.c  Wed Jan 31 09:00:10 2001
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: pdf.c,v 1.67 2001/01/26 18:52:37 eschmid Exp $ */
+/* $Id: pdf.c,v 1.68 2001/01/31 17:00:10 dbeu Exp $ */
 
 /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -2368,7 +2368,7 @@
convert_to_long_ex(arg6);
convert_to_long_ex(arg7);
 
-   pdf_image = PDF_open_ccitt(pdf,
+   pdf_image = PDF_open_CCITT(pdf,
image,
Z_LVAL_PP(arg3),
Z_LVAL_PP(arg4),



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/ming ming.dsp php_ming.h

2001-01-31 Thread Daniel Beulshausen 

dbeuWed Jan 31 09:05:01 2001 EDT

  Added files: 
/php4/ext/ming  ming.dsp 

  Modified files:  
/php4/ext/ming  php_ming.h 
  Log:
  nuke warning, and add dsp
  
Index: php4/ext/ming/php_ming.h
diff -u php4/ext/ming/php_ming.h:1.1 php4/ext/ming/php_ming.h:1.2
--- php4/ext/ming/php_ming.h:1.1Fri Jan 26 16:26:22 2001
+++ php4/ext/ming/php_ming.hWed Jan 31 09:04:59 2001
@@ -30,11 +30,6 @@
 
 #include "ming.h"
 
-/* Checking for thread safety and issue warning if necessary. */
-#ifdef ZTS
-#warning ming has not been tested for thread-safety!  nyah!
-#endif
-
 extern zend_module_entry ming_module_entry;
 #define ming_module_ptr ming_module_entry
 

Index: php4/ext/ming/ming.dsp
+++ php4/ext/ming/ming.dsp
# Microsoft Developer Studio Project File - Name="ming" - Package Owner=4
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

CFG=ming - Win32 Debug_TS
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "ming.mak".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "ming.mak" CFG="ming - Win32 Debug_TS"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "ming - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "ming - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "ming - Win32 Release_TS"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release_TS"
# PROP BASE Intermediate_Dir "Release_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release_TS"
# PROP Intermediate_Dir "Release_TS"
# 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" /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 BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /machine:I386
# ADD LINK32 php4ts.lib libming.lib kernel32.lib user32.lib gdi32.lib winspool.lib 
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_ming.dll" 
/libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"

!ELSEIF  "$(CFG)" == "ming - Win32 Debug_TS"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug_TS"
# PROP BASE Intermediate_Dir "Debug_TS"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug_TS"
# PROP Intermediate_Dir "Debug_TS"
# 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" /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 BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"
# ADD RSC /l 0x407 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 php4ts_debug.lib libming.lib kernel32.lib user32.lib gdi32.lib 
winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 
/out:"..\..\Debug_TS/php_ming.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"

!ENDIF 

# Begin Target

# Name "ming - Win32 Release_TS"
# Name "ming - Win32 Debug_TS"
# Begin Group "Source Files"

# PROP Default_Filter

[PHP-CVS] cvs: php4 /win32 php_modules.dsw

2001-01-31 Thread Daniel Beulshausen 

dbeuWed Jan 31 09:12:12 2001 EDT

  Modified files:  
/php4/win32 php_modules.dsw 
  Log:
  add iconv and ming
  
Index: php4/win32/php_modules.dsw
diff -u php4/win32/php_modules.dsw:1.35 php4/win32/php_modules.dsw:1.36
--- php4/win32/php_modules.dsw:1.35 Thu Jan 25 14:07:30 2001
+++ php4/win32/php_modules.dsw  Wed Jan 31 09:12:12 2001
@@ -123,6 +123,18 @@
 
 ###
 
+Project: "iconv"=..\ext\iconv\iconv.dsp - Package Owner=4
+
+Package=5
+{{{
+}}}
+
+Package=4
+{{{
+}}}
+
+###
+
 Project: "exif"=..\ext\exif\exif.dsp - Package Owner=4
 
 Package=5
@@ -256,6 +268,18 @@
 ###
 
 Project: "ldap"=..\ext\ldap\ldap.dsp - Package Owner=4
+
+Package=5
+{{{
+}}}
+
+Package=4
+{{{
+}}}
+
+###
+
+Project: "ming"=..\ext\ming\ming.dsp - Package Owner=4
 
 Package=5
 {{{



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/msql msql.dsp php_msql.c php_msql.h /win32 php_modules.dsw

2001-01-25 Thread Daniel Beulshausen 

dbeuThu Jan 25 14:07:31 2001 EDT

  Added files: 
/php4/ext/msql  msql.dsp 

  Modified files:  
/php4/ext/msql  php_msql.c php_msql.h 
/php4/win32 php_modules.dsw 
  Log:
  make msql build under win32
  

Index: php4/ext/msql/php_msql.c
diff -u php4/ext/msql/php_msql.c:1.28 php4/ext/msql/php_msql.c:1.29
--- php4/ext/msql/php_msql.c:1.28   Sat Nov  4 02:45:30 2000
+++ php4/ext/msql/php_msql.cThu Jan 25 14:07:30 2001
@@ -16,7 +16,7 @@
+--+
  */
  
-/* $Id: php_msql.c,v 1.28 2000/11/04 10:45:30 zeev Exp $ */
+/* $Id: php_msql.c,v 1.29 2001/01/25 22:07:30 dbeu Exp $ */
 
 #include "php.h"
 #include "php_msql.h"
@@ -150,7 +150,7 @@
msql_globals.num_links--;
 }
 
-DLEXPORT PHP_MINIT_FUNCTION(msql)
+PHP_MINIT_FUNCTION(msql)
 {
if 
(cfg_get_long("msql.allow_persistent",msql_globals.allow_persistent)==FAILURE) {
msql_globals.allow_persistent=1;
@@ -175,7 +175,7 @@
return SUCCESS;
 }
 
-DLEXPORT PHP_RINIT_FUNCTION(msql)
+PHP_RINIT_FUNCTION(msql)
 {
msql_globals.default_link=-1;
msql_globals.num_links = msql_globals.num_persistent;
@@ -183,7 +183,7 @@
return SUCCESS;
 }
 
-DLEXPORT PHP_MINFO_FUNCTION(msql)
+PHP_MINFO_FUNCTION(msql)
 {
char maxp[32],maxl[32];
 
@@ -363,7 +363,7 @@
 
 /* {{{ proto int msql_connect([string hostname[:port]] [, string username] [, string 
password])
Open a connection to an mSQL Server */
-DLEXPORT PHP_FUNCTION(msql_connect)
+PHP_FUNCTION(msql_connect)
 {
php_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
 }
@@ -372,7 +372,7 @@
 
 /* {{{ proto int msql_pconnect([string hostname[:port]] [, string username] [, string 
password])
Open a persistent connection to an mSQL Server */
-DLEXPORT PHP_FUNCTION(msql_pconnect)
+PHP_FUNCTION(msql_pconnect)
 {
php_msql_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
 }
@@ -381,7 +381,7 @@
 
 /* {{{ proto int msql_close([int link_identifier])
Close an mSQL connection */
-DLEXPORT PHP_FUNCTION(msql_close)
+PHP_FUNCTION(msql_close)
 {
pval *msql_link;
int id;
@@ -421,7 +421,7 @@
 
 /* {{{ proto int msql_select_db(string database_name [, int link_identifier])
Select an mSQL database */
-DLEXPORT PHP_FUNCTION(msql_select_db)
+PHP_FUNCTION(msql_select_db)
 {
pval *db,*msql_link;
int id;
@@ -461,7 +461,7 @@
 
 /* {{{ proto int msql_create_db(string database_name [, int link_identifier])
Create an mSQL database */
-DLEXPORT PHP_FUNCTION(msql_create_db)
+PHP_FUNCTION(msql_create_db)
 {
pval *db,*msql_link;
int id;
@@ -499,7 +499,7 @@
 
 /* {{{ proto int msql_drop_db(string database_name [, int link_identifier])
Drop (delete) an mSQL database */
-DLEXPORT PHP_FUNCTION(msql_drop_db)
+PHP_FUNCTION(msql_drop_db)
 {
pval *db,*msql_link;
int id;
@@ -537,7 +537,7 @@
 
 /* {{{ proto int msql_query(string query [, int link_identifier])
Send an SQL query to mSQL */
-DLEXPORT PHP_FUNCTION(msql_query)
+PHP_FUNCTION(msql_query)
 {
pval *query,*msql_link;
int id;
@@ -575,7 +575,7 @@
 
 /* {{{ proto int msql_db_query(string database_name, string query [, int 
link_identifier])
Send an SQL query to mSQL */
-DLEXPORT PHP_FUNCTION(msql_db_query)
+PHP_FUNCTION(msql_db_query)
 {
pval *db,*query,*msql_link;
int id;
@@ -618,7 +618,7 @@
 
 /* {{{ proto int msql_list_dbs([int link_identifier])
List databases available on an mSQL server */
-DLEXPORT PHP_FUNCTION(msql_list_dbs)
+PHP_FUNCTION(msql_list_dbs)
 {
pval *msql_link;
int id;
@@ -653,7 +653,7 @@
 
 /* {{{ proto int msql_list_tables(string database_name [, int link_identifier])
List tables in an mSQL database */
-DLEXPORT PHP_FUNCTION(msql_list_tables)
+PHP_FUNCTION(msql_list_tables)
 {
pval *db,*msql_link;
int id;
@@ -695,7 +695,7 @@
 
 /* {{{ proto int msql_list_fields(string database_name, string table_name [, int 
link_identifier])
List mSQL result fields */
-DLEXPORT PHP_FUNCTION(msql_list_fields)
+PHP_FUNCTION(msql_list_fields)
 {
pval *db,*table,*msql_link;
int id;
@@ -749,7 +749,7 @@
 
 /* {{{ proto int msql_result(int query, int row [, mixed field])
Get result data */
-DLEXPORT PHP_FUNCTION(msql_result)
+PHP_FUNCTION(msql_result)
 {
pval *result, *row, *field=NULL;
m_result *msql_result;
@@ -853,7 +853,7 @@
 
 /* {{{ proto int msql_num_rows(int query)
Get number of rows in a result */
-DLEXPORT PHP_FUNCTION(msql_num_rows)
+PHP_FUNCTION(msql_num_rows)
 {
pval *result;
m_result *msql_result;
@@ -871,7 +871,7 @@
 
 /* {{{ proto int msql_num_fields(int query)
Get number of fields in a result */
-DLEXPORT PHP_FUNCTION(msql_num_fields)
+PHP_FUNCTION(msql_num_fields)
 {
pval *result;
m_result *msql_result;
@@ -965,7 +965,7 @@
 
 /* {{{ proto array

[PHP-CVS] cvs: php4 /ext/sablot sablot.dsp

2001-01-11 Thread Daniel Beulshausen 

dbeuThu Jan 11 06:50:52 2001 EDT

  Modified files:  
/php4/ext/sablotsablot.dsp 
  Log:
  removed old expat libs
  
  
Index: php4/ext/sablot/sablot.dsp
diff -u php4/ext/sablot/sablot.dsp:1.1 php4/ext/sablot/sablot.dsp:1.2
--- php4/ext/sablot/sablot.dsp:1.1  Wed Oct 11 02:17:10 2000
+++ php4/ext/sablot/sablot.dsp  Thu Jan 11 06:50:52 2001
@@ -53,7 +53,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 php4ts-debug.lib sablot.lib xmlparse.lib xmltok.lib kernel32.lib 
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib 
oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 
/out:"..\..\Debug_TS/php_sablot.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
+# ADD LINK32 php4ts_debug.lib sablot.lib kernel32.lib user32.lib gdi32.lib 
+winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib 
+odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 
+/out:"..\..\Debug_TS/php_sablot.dll" /pdbtype:sept /libpath:"..\..\Debug_TS"
 
 !ELSEIF  "$(CFG)" == "sablot - Win32 Release_TS"
 
@@ -79,7 +79,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 
/nologo /dll /machine:I386
-# ADD LINK32 php4ts.lib sablot.lib xmlparse.lib xmltok.lib kernel32.lib user32.lib 
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib 
uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 
/out:"..\..\Release_TS/php_sablot.dll" /libpath:"..\..\Release_TS" 
/libpath:"..\..\Release_TS_Inline"
+# ADD LINK32 php4ts.lib sablot.lib kernel32.lib user32.lib gdi32.lib winspool.lib 
+comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
+odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_sablot.dll" 
+/libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline"
 
 !ENDIF 
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]