cvs: php4 /ext/fdf fdf.c php_fdf.h
| From: | Andi Gutmans | Date: | Thu, 06 Jul 2000 14:47:03 +0000 |
| Subject: | cvs: php4 /ext/fdf fdf.c php_fdf.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-646@lists.php.net to get a copy of this message | ||
andi Thu Jul 6 07:47:03 2000 EDT
Modified files:
/php4/ext/fdf fdf.c php_fdf.h
Log:
- Use #ifdef PHP_WIN32 to detect Windows
Index: php4/ext/fdf/fdf.c
diff -u php4/ext/fdf/fdf.c:1.27 php4/ext/fdf/fdf.c:1.28
--- php4/ext/fdf/fdf.c:1.27 Wed Jul 5 22:30:05 2000
+++ php4/ext/fdf/fdf.c Thu Jul 6 07:47:02 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fdf.c,v 1.27 2000/07/06 05:30:05 steinm Exp $ */
+/* $Id: fdf.c,v 1.28 2000/07/06 14:47:02 andi Exp $ */
/* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from
http://beta1.adobe.com/ada/acrosdk/forms.html.
*/
@@ -54,7 +54,7 @@
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
-#if WIN32|WINNT
+#ifdef PHP_WIN32
# include <io.h>
# include <fcntl.h>
#endif
@@ -115,7 +115,7 @@
{
FDFErc err;
FDF_GLOBAL(le_fdf) = register_list_destructors(phpi_FDFClose, NULL);
-#ifdef WIN32
+#ifdef PHP_WIN32
return SUCCESS;
#endif
err = FDFInitialize();
@@ -136,7 +136,7 @@
PHP_MSHUTDOWN_FUNCTION(fdf)
{
FDFErc err;
-#ifdef WIN32
+#ifdef PHP_WIN32
return SUCCESS;
#endif
err = FDFFinalize();
Index: php4/ext/fdf/php_fdf.h
diff -u php4/ext/fdf/php_fdf.h:1.5 php4/ext/fdf/php_fdf.h:1.6
--- php4/ext/fdf/php_fdf.h:1.5 Wed Jul 5 22:36:54 2000
+++ php4/ext/fdf/php_fdf.h Thu Jul 6 07:47:02 2000
@@ -26,13 +26,13 @@
| Authors: Uwe Steinmann |
+----------------------------------------------------------------------+
*/
-/* $Id: php_fdf.h,v 1.5 2000/07/06 05:36:54 steinm Exp $ */
+/* $Id: php_fdf.h,v 1.6 2000/07/06 14:47:02 andi Exp $ */
#ifndef PHP_FDF_H
#define PHP_FDF_H
#if HAVE_FDFLIB
-#if WIN32|WINNT
+#ifdef PHP_WIN32
#else
#define UNIX_DEV
#endif