ports/67708: PHP 4.3.7 wont compile with FreeTDS MsSQL extension

[Henry Karpatskij]

>Number:         67708
>Category:       ports
>Synopsis:       PHP 4.3.7 wont compile with FreeTDS MsSQL extension
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 08 09:20:19 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Henry Karpatskij
>Release:        FreeBSD 4.9-RELEASE-p4 i386
>Organization:
none
>Environment:
System: FreeBSD eloris.spheroid.info 4.9-RELEASE-p4 FreeBSD 4.9-RELEASE-p4 #0: Thu Mar 18 00:29:33 EET 2004 root at eloris.
spheroid.info:/usr/obj/usr/src/sys/ELORIS i386

>Description:
	PHP compile process fails as described in <http://bugs.php.net/bug.php?id=28626>
>How-To-Repeat:
	Just compile PHP with FreeTDS MsSQL support.
>Fix:
	Add the following files to the lang/php4/files directory and recompile PHP.

--[ patch-ext::mssql::php_mssql.h ]--->

--- 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
@@ -17,7 +17,7 @@
  */


-/* $Id: php_mssql.h,v 1.23.4.10 2004/04/20 23:37:26 fmk Exp $ */
+/* $Id: php_mssql.h,v 1.23.4.11 2004/06/04 01:02:21 pollita Exp $ */

 #ifndef PHP_MSSQL_H
 #define PHP_MSSQL_H
@@ -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

<--- [ EOF ] --

--[ patch-ext::mssql::php_mssql.c ]--->

--- ext/mssql/php_mssql.c.orig  Tue Jun  8 11:24:50 2004
+++ ext/mssql/php_mssql.c       Tue Jun  8 11:23:22 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */

-/* $Id: php_mssql.c,v 1.86.2.32 2004/04/20 23:31:39 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.33 2004/06/04 01:02:21 pollita Exp $ */

 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -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;
 }

<--- [ EOF ] --
>Release-Note:
>Audit-Trail:
>Unformatted: