summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2010-10-26 15:05:38 (GMT)
committerMark Brand <mabrand@mabrand.nl>2010-10-26 15:05:38 (GMT)
commitb0431deb3cdf401fed1470d5d3b2775c62308c5c (patch)
tree8f4db1f741d6ce42ff398966d72d8470f3ae6d7f
parente61f3fb7d57058bbffcea5c63f31863d1345d014 (diff)
downloadmxe-b0431deb3cdf401fed1470d5d3b2775c62308c5c.zip
mxe-b0431deb3cdf401fed1470d5d3b2775c62308c5c.tar.gz
mxe-b0431deb3cdf401fed1470d5d3b2775c62308c5c.tar.bz2
upgrade package freetds to cvs
-rw-r--r--src/freetds-1-fastforward.patch126
1 files changed, 126 insertions, 0 deletions
diff --git a/src/freetds-1-fastforward.patch b/src/freetds-1-fastforward.patch
index e12187e..c470d40 100644
--- a/src/freetds-1-fastforward.patch
+++ b/src/freetds-1-fastforward.patch
@@ -157166,3 +157166,129 @@ index c158760..9e9cc4a 100644
typedef SSIZE_T ssize_t;
-#define HAVE_LOCALE_H 1
+
+commit 6935c8236865d4be873cc0edfa43d4c6e4cced75
+Author: freddy77 <freddy77>
+Date: Tue Oct 26 08:12:48 2010 +0000
+
+ some fixes for win64 and MingW
+
+diff --git a/ChangeLog b/ChangeLog
+index 529899e..352bebc 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++Tue Oct 26 10:12:21 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
++ * configure.ac misc/prepare_win32.sh src/ctlib/unittests/cancel.c:
++ * src/dblib/unittests/null.c src/dblib/unittests/null2.c:
++ - some fixes for win64 and MingW
++
+ Fri Oct 22 22:14:48 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
+ * win32/config.h: add missing define for msvc6
+
+@@ -2962,4 +2967,4 @@ Wed Jan 9 19:54:43 EST 2008 JK Lowden <jklowden@freetds.org>
+ * ChangeLog-0.82 added because of release
+
+ $FreeTDS$
+-$Id: ChangeLog,v 1.3146 2010/10/22 20:14:53 freddy77 Exp $
++$Id: ChangeLog,v 1.3147 2010/10/26 08:12:48 freddy77 Exp $
+diff --git a/configure.ac b/configure.ac
+index 2f2f923..960c834 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+
+ dnl ------------------------------------------------------------
+-dnl $Id: configure.ac,v 1.56 2010/09/14 02:12:37 jklowden Exp $
++dnl $Id: configure.ac,v 1.57 2010/10/26 08:12:48 freddy77 Exp $
+ dnl If you're trying to create a new configure test, try
+ dnl
+ dnl http://autogen.sourceforge.net/conftest.html
+@@ -15,7 +15,7 @@ dnl ------------------------------------------------------------
+ AC_INIT(FreeTDS, 0.83.dev.esyscmd(printf $(date +"%Y%m%d")))
+ AC_CONFIG_SRCDIR(src/dblib/dblib.c)
+ AC_PREREQ(2.53)
+-AC_REVISION($Revision: 1.56 $)
++AC_REVISION($Revision: 1.57 $)
+
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ AC_CONFIG_HEADERS(include/config.h)
+@@ -459,7 +459,7 @@ AC_CHECK_FUNCS([inet_ntoa_r getipnodebyaddr getipnodebyname \
+ getaddrinfo getnameinfo inet_ntop gethostname poll])
+ LIBS="$OLD_LIBS"
+ AC_REPLACE_FUNCS([asprintf vasprintf atoll strtok_r readpassphrase \
+-strlcpy strlcat basename])
++strlcpy strlcat basename getopt])
+ AC_FUNC_FSEEKO
+ TDS_GETTIMEMILLI
+
+diff --git a/misc/prepare_win32.sh b/misc/prepare_win32.sh
+index 14156c1..de8a156 100755
+--- a/misc/prepare_win32.sh
++++ b/misc/prepare_win32.sh
+@@ -22,7 +22,7 @@ for param
+ do
+ case $param in
+ --win64)
+- HOSTS='x86_64-w64-mingw32 x86_64-pc-mingw32'
++ HOSTS='x86_64-w64-mingw32 x86_64-pc-mingw32 amd64-mingw32msvc'
+ TYPE=win64
+ ;;
+ --zip)
+diff --git a/src/ctlib/unittests/cancel.c b/src/ctlib/unittests/cancel.c
+index a0510cb..8946a1c 100644
+--- a/src/ctlib/unittests/cancel.c
++++ b/src/ctlib/unittests/cancel.c
+@@ -5,12 +5,16 @@
+ #include <stdio.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
++
++#if HAVE_UNISTD_H
+ #include <unistd.h>
++#endif /* HAVE_UNISTD_H */
++
+ #include <signal.h>
+ #include <ctpublic.h>
+ #include "common.h"
+
+-static char software_version[] = "$Id: cancel.c,v 1.13 2010/09/22 07:03:59 freddy77 Exp $";
++static char software_version[] = "$Id: cancel.c,v 1.14 2010/10/26 08:12:48 freddy77 Exp $";
+ static void *no_unused_var_warn[] = { software_version, no_unused_var_warn };
+
+ #if defined(HAVE_ALARM) && defined(HAVE_SETITIMER)
+diff --git a/src/dblib/unittests/null.c b/src/dblib/unittests/null.c
+index b657b19..26e659e 100644
+--- a/src/dblib/unittests/null.c
++++ b/src/dblib/unittests/null.c
+@@ -5,9 +5,11 @@
+
+ #include "common.h"
+
++#if HAVE_UNISTD_H
+ #include <unistd.h>
++#endif /* HAVE_UNISTD_H */
+
+-static char software_version[] = "$Id: null.c,v 1.8 2009/03/19 13:11:41 freddy77 Exp $";
++static char software_version[] = "$Id: null.c,v 1.9 2010/10/26 08:12:48 freddy77 Exp $";
+ static void *no_unused_var_warn[] = { software_version, no_unused_var_warn };
+
+ #ifndef DBNTWIN32
+diff --git a/src/dblib/unittests/null2.c b/src/dblib/unittests/null2.c
+index 6433147..62f0207 100644
+--- a/src/dblib/unittests/null2.c
++++ b/src/dblib/unittests/null2.c
+@@ -4,9 +4,11 @@
+
+ #include "common.h"
+
++#if HAVE_UNISTD_H
+ #include <unistd.h>
++#endif /* HAVE_UNISTD_H */
+
+-static char software_version[] = "$Id: null2.c,v 1.7 2010/02/01 14:56:28 freddy77 Exp $";
++static char software_version[] = "$Id: null2.c,v 1.8 2010/10/26 08:12:48 freddy77 Exp $";
+ static void *no_unused_var_warn[] = { software_version, no_unused_var_warn };
+
+ static DBPROCESS *dbproc = NULL;