From henkka@eloris.spheroid.info  Tue Jun  8 09:21:43 2004
Return-Path: <henkka@eloris.spheroid.info>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 81AA116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Jun 2004 09:21:43 +0000 (GMT)
Received: from eloris.spheroid.info (eloris.spheroid.info [62.142.98.98])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 35C3C43D5D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Jun 2004 09:21:43 +0000 (GMT)
	(envelope-from henkka@eloris.spheroid.info)
Received: from localhost (localhost [127.0.0.1])
	by eloris.spheroid.info (Postfix) with ESMTP id 4B772115
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Jun 2004 12:21:45 +0300 (EEST)
Received: from eloris.spheroid.info ([127.0.0.1])
 by localhost (eloris.spheroid.info [127.0.0.1]) (amavisd-new, port 10024)
 with LMTP id 40160-01 for <FreeBSD-gnats-submit@freebsd.org>;
 Tue,  8 Jun 2004 12:21:43 +0300 (EEST)
Received: by eloris.spheroid.info (Postfix, from userid 1001)
	id C24AA10D; Tue,  8 Jun 2004 12:21:43 +0300 (EEST)
Message-Id: <20040608092143.C24AA10D@eloris.spheroid.info>
Date: Tue,  8 Jun 2004 12:21:43 +0300 (EEST)
From: Henry Karpatskij <henkka@spheroid.info>
Reply-To: Henry Karpatskij <henkka@spheroid.info>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: PHP 4.3.7 wont compile with FreeTDS MsSQL extension [RESEND]
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         67710
>Category:       ports
>Synopsis:       PHP 4.3.7 wont compile with FreeTDS MsSQL extension [RESEND]
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 08 09:30:32 GMT 2004
>Closed-Date:    Tue Jun 08 13:26:32 GMT 2004
>Last-Modified:  Tue Jun 08 13:26:32 GMT 2004
>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@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>

	Ob: I'm resending this one with a proper email address (sorry about that)

>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

------------------------------------------------------------
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;
 }
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: clement 
Responsible-Changed-When: Tue Jun 8 12:50:33 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67710 

From: Henry Karpatskij <henry.karpatskij@hairit.fi>
To: freebsd-gnats-submit@FreeBSD.org, henkka@spheroid.info
Cc:  
Subject: Re: ports/67710: PHP 4.3.7 wont compile with FreeTDS MsSQL extension
 [RESEND]
Date: Tue, 08 Jun 2004 16:14:16 +0300

 I forgot to mention that the error will most likely go away in the next 
 release, since this one was fixed in PHP CVS after the 4.3.7 release.
 
 And sorry again about the duplicate, this is my first time sending PR's 
 and I'm feeling a little frantic or something.
 
 -- 
 Henry Karpatskij                                        Airport Plaza
 Jrjestelmkehittj                                     yritie 12 C
 HairIT <http://www.hairit.fi/>                           01510 Vantaa
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Tue Jun 8 13:26:18 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=67710 
>Unformatted:
