RE: [PHP-DEV] fix for ext/notes

2003-02-09 Thread Jani Taskinen

I committed the php_notes.c fixes..but someone who actually
can compile stuff on windows should handle the dsp stuff.

--Jani

p.s. Shouldn't this extension be moved to PECL?


On Thu, 6 Feb 2003, Kai Schröder wrote:

>> Next try with other name.
>
>This version is without indendations (thanks Derick).
>
>Regards, Kai

-- 
<- For Sale! ->


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




RE: [PHP-DEV] fix for ext/notes

2003-02-06 Thread Kai Schröder
> Next try with other name.

This version is without indendations (thanks Derick).

Regards, Kai
Index: notes.dsp
===
RCS file: /repository/php4/ext/notes/notes.dsp,v
retrieving revision 1.1
diff -u -r1.1 notes.dsp
--- notes.dsp   16 Feb 2001 21:36:28 -  1.1
+++ notes.dsp   6 Feb 2003 19:33:32 -
@@ -56,7 +56,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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib 
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib 
php4nts.lib /nologo /dll /machine:I386 /out:"Release/php_notes.dll" 
/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release"
+# 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 libmySQL.lib 
+php4nts.lib /nologo /dll /machine:I386 /out:"..\..\Release/php_notes.dll" 
+/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release"
 
 !ELSEIF  "$(CFG)" == "notes - Win32 Debug"
 
@@ -135,7 +135,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 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 
notes.lib /nologo /dll /machine:I386 /out:"Release_TS/php_notes.dll" 
/libpath:"..\..\Release_TS"
+# 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 
+notes.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_notes.dll" 
+/libpath:"..\..\Release_TS"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "notes - Win32 Release_TS_inline"
@@ -162,8 +162,8 @@
 # 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 
libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:"Release_TS/php_notes.dll" 
/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS"
-# 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 libmySQL.lib 
php4ts.lib /nologo /dll /machine:I386 /out:"Release_TS_inline/php_notes.dll" 
/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS_inline"
+# 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 
+libmySQL.lib php4ts.lib /nologo /dll /machine:I386 
+/out:"..\..\Release_TS/php_notes.dll" /libpath:"..\..\..\MySQL\lib\opt" 
+/libpath:"..\..\Release_TS"
+# 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 libmySQL.lib 
+php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php_notes.dll" 
+/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS_inline"
 
 !ENDIF 
 
Index: php_notes.c
===
RCS file: /repository/php4/ext/notes/php_notes.c,v
retrieving revision 1.15.8.1
diff -u -r1.15.8.1 php_notes.c
--- php_notes.c 31 Dec 2002 16:35:02 -  1.15.8.1
+++ php_notes.c 6 Feb 2003 19:33:44 -
@@ -31,7 +31,12 @@
 #include "php_notes.h"
 #include "ext/standard/info.h"
 
-#include 
+#ifdef PHP_WIN32
+#include 
+#else
+#include 
+#endif
+
 #include 
 #include 
 #include 
@@ -60,7 +65,11 @@
 #include 
 
 #include 
-#include 
+#ifdef PHP_WIN32
+#include 
+#else
+#include 
+#endif
 #include 
 #include 
 #include  /* OSPathNetConstruct */


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


RE: [PHP-DEV] fix for ext/notes

2003-02-06 Thread Kai Schröder
> On Thu, 6 Feb 2003, [iso-8859-1] Kai Schröder wrote:
> > Attached diff will fix compiling problems for ext/notes on
> Windows (wrong
> > includes, wrong output dir). It tested with Notes C API R5 and
> R6. Please
> > commit.
> empty attachment

Next try with other name.

Regards, Kai

Index: notes.dsp
===
RCS file: /repository/php4/ext/notes/notes.dsp,v
retrieving revision 1.1
diff -u -r1.1 notes.dsp
--- notes.dsp   16 Feb 2001 21:36:28 -  1.1
+++ notes.dsp   6 Feb 2003 19:33:32 -
@@ -56,7 +56,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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib 
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib 
php4nts.lib /nologo /dll /machine:I386 /out:"Release/php_notes.dll" 
/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release"
+# 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 libmySQL.lib 
+php4nts.lib /nologo /dll /machine:I386 /out:"..\..\Release/php_notes.dll" 
+/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release"
 
 !ELSEIF  "$(CFG)" == "notes - Win32 Debug"
 
@@ -135,7 +135,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 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 
notes.lib /nologo /dll /machine:I386 /out:"Release_TS/php_notes.dll" 
/libpath:"..\..\Release_TS"
+# 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 
+notes.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_notes.dll" 
+/libpath:"..\..\Release_TS"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "notes - Win32 Release_TS_inline"
@@ -162,8 +162,8 @@
 # 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 
libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:"Release_TS/php_notes.dll" 
/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS"
-# 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 libmySQL.lib 
php4ts.lib /nologo /dll /machine:I386 /out:"Release_TS_inline/php_notes.dll" 
/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS_inline"
+# 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 
+libmySQL.lib php4ts.lib /nologo /dll /machine:I386 
+/out:"..\..\Release_TS/php_notes.dll" /libpath:"..\..\..\MySQL\lib\opt" 
+/libpath:"..\..\Release_TS"
+# 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 libmySQL.lib 
+php4ts.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php_notes.dll" 
+/libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release_TS_inline"
 
 !ENDIF 
 
Index: php_notes.c
===
RCS file: /repository/php4/ext/notes/php_notes.c,v
retrieving revision 1.15.8.1
diff -u -r1.15.8.1 php_notes.c
--- php_notes.c 31 Dec 2002 16:35:02 -  1.15.8.1
+++ php_notes.c 6 Feb 2003 19:33:44 -
@@ -31,7 +31,12 @@
 #include "php_notes.h"
 #include "ext/standard/info.h"
 
-#include 
+#ifdef PHP_WIN32
+#include 
+#else
+#include 
+#endif
+
 #include 
 #include 
 #include 
@@ -60,7 +65,11 @@
 #include 
 
 #include 
-#include 
+#ifdef PHP_WIN32
+#include 
+#else
+#include 
+#endif
 #include 
 #include 
 #include  /* OSPathNetConstruct */


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


Re: [PHP-DEV] fix for ext/notes

2003-02-06 Thread Derick Rethans
On Thu, 6 Feb 2003, [iso-8859-1] Kai Schröder wrote:

> Attached diff will fix compiling problems for ext/notes on Windows (wrong
> includes, wrong output dir). It tested with Notes C API R5 and R6. Please
> commit.

empty attachment

Derick

-- 

-
 Derick Rethans http://derickrethans.nl/ 
 PHP Magazine - PHP Magazine for Professionals   http://php-mag.net/
-


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




[PHP-DEV] fix for ext/notes

2003-02-06 Thread Kai Schröder
Attached diff will fix compiling problems for ext/notes on Windows (wrong
includes, wrong output dir). It tested with Notes C API R5 and R6. Please
commit.

Regards, Kai


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