summaryrefslogtreecommitdiff
path: root/lang/php4
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2004-06-08 13:23:43 +0000
committerAlex Dupre <ale@FreeBSD.org>2004-06-08 13:23:43 +0000
commit37306f248596083f6e5000fd4b381cf796d51d54 (patch)
tree119716ac6e6f490aae6c15ed95709443f9267402 /lang/php4
parent- Fix MASTER_SITES (diff)
Fix compilation of FreeTDS MSSQL extension.
PR: ports/67710 Submitted by: Henry Karpatskij <henkka@spheroid.info> Obtained from: PHP CVS repository
Notes
Notes: svn path=/head/; revision=111088
Diffstat (limited to 'lang/php4')
-rw-r--r--lang/php4/files/patch-ext::mssql::php_mssql.c11
-rw-r--r--lang/php4/files/patch-ext::mssql::php_mssql.h13
2 files changed, 24 insertions, 0 deletions
diff --git a/lang/php4/files/patch-ext::mssql::php_mssql.c b/lang/php4/files/patch-ext::mssql::php_mssql.c
new file mode 100644
index 000000000000..40ec852b4dad
--- /dev/null
+++ b/lang/php4/files/patch-ext::mssql::php_mssql.c
@@ -0,0 +1,11 @@
+--- ext/mssql/php_mssql.c.orig Wed Apr 21 01:31:39 2004
++++ ext/mssql/php_mssql.c Tue Jun 8 15:19:55 2004
+@@ -336,7 +336,7 @@
+ dbsetlogintime(MS_SQL_G(connect_timeout));
+ if (MS_SQL_G(timeout) < 0) MS_SQL_G(timeout) = 60;
+ dbsettime(MS_SQL_G(timeout));
+- dbsetmaxprocs((SHORT)MS_SQL_G(max_procs));
++ dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs));
+
+ return SUCCESS;
+ }
diff --git a/lang/php4/files/patch-ext::mssql::php_mssql.h b/lang/php4/files/patch-ext::mssql::php_mssql.h
new file mode 100644
index 000000000000..a624d918a819
--- /dev/null
+++ b/lang/php4/files/patch-ext::mssql::php_mssql.h
@@ -0,0 +1,13 @@
+--- ext/mssql/php_mssql.h.orig Tue Jun 8 11:24:27 2004
++++ ext/mssql/php_mssql.h Tue Jun 8 11:23:39 2004
+@@ -37,9 +37,7 @@
+ #include "sqldb.h"
+
+ #if HAVE_FREETDS
+-#ifndef SHORT
+-typedef short SHORT;
+-#endif
++typedef short TDS_SHORT;
+ #define SQLTEXT SYBTEXT
+ #define SQLCHAR SYBCHAR
+ #define SQLVARCHAR SYBVARCHAR