Mercurial > mxe-octave

comparison src/freetds-1-fastforward.patch @ 1108:4901471c9b7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade package freetds to cvs
author Mark Brand <mabrand@mabrand.nl>
date Wed, 01 Sep 2010 15:11:19 +0200
parents be4292f84a3b
children 97a64ad8b555
comparison
equal deleted inserted replaced
1107:4dacc284e354 1108:4901471c9b7d
153665 +# Begin Source File 153665 +# Begin Source File
153666 + 153666 +
153667 SOURCE=..\..\src\replacements\strlcpy.c 153667 SOURCE=..\..\src\replacements\strlcpy.c
153668 # End Source File 153668 # End Source File
153669 # Begin Source File 153669 # Begin Source File
153670
153671 commit 5582558982e31d1495324b72fbdfce981fd79073
153672 Author: freddy77 <freddy77>
153673 Date: Wed Aug 18 11:27:46 2010 +0000
153674
153675 add missing declaration
153676
153677 diff --git a/ChangeLog b/ChangeLog
153678 index 00f64f4..b1cddaf 100644
153679 --- a/ChangeLog
153680 +++ b/ChangeLog
153681 @@ -1,3 +1,6 @@
153682 +Wed Aug 18 13:27:30 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
153683 + * include/replacements.h: add missing declaration
153684 +
153685 Tue Aug 17 15:15:57 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
153686 * include/tdsodbc.h win32/FreeTDS_w.def win32/Makefile.am:
153687 * win32/msvc6/FreeTDS.dsp win32/msvc6/libTDS.dsp:
153688 @@ -2834,4 +2837,4 @@ Wed Jan 9 19:54:43 EST 2008 JK Lowden <jklowden@freetds.org>
153689 * ChangeLog-0.82 added because of release
153690
153691 $FreeTDS$
153692 -$Id: ChangeLog,v 1.3113 2010/08/17 13:16:05 freddy77 Exp $
153693 +$Id: ChangeLog,v 1.3114 2010/08/18 11:27:46 freddy77 Exp $
153694 diff --git a/include/replacements.h b/include/replacements.h
153695 index 175e3e4..37913fe 100644
153696 --- a/include/replacements.h
153697 +++ b/include/replacements.h
153698 @@ -20,7 +20,7 @@
153699 #ifndef _replacements_h_
153700 #define _replacements_h_
153701
153702 -/* $Id: replacements.h,v 1.27 2010/08/05 08:58:36 freddy77 Exp $ */
153703 +/* $Id: replacements.h,v 1.28 2010/08/18 11:27:47 freddy77 Exp $ */
153704
153705 #include <stdarg.h>
153706 #include "tds_sysdep_public.h"
153707 @@ -119,7 +119,7 @@ char *tds_basename(char *path);
153708 int gettimeofday (struct timeval *tv, void *tz);
153709 int getopt(int argc, char * const argv[], const char *optstring);
153710 extern char *optarg;
153711 -extern int optind, offset, opterr;
153712 +extern int optind, offset, opterr, optreset;
153713 #endif
153714
153715 #ifdef __cplusplus
153716
153717 commit 44111f1b2b43c0151dd10c95a1f759ff354088fe
153718 Author: freddy77 <freddy77>
153719 Date: Wed Aug 18 11:37:36 2010 +0000
153720
153721 search correct host
153722
153723 diff --git a/ChangeLog b/ChangeLog
153724 index b1cddaf..7a5621d 100644
153725 --- a/ChangeLog
153726 +++ b/ChangeLog
153727 @@ -1,3 +1,6 @@
153728 +Wed Aug 18 13:37:35 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
153729 + * misc/prepare_win32.sh: search correct host
153730 +
153731 Wed Aug 18 13:27:30 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
153732 * include/replacements.h: add missing declaration
153733
153734 @@ -2837,4 +2840,4 @@ Wed Jan 9 19:54:43 EST 2008 JK Lowden <jklowden@freetds.org>
153735 * ChangeLog-0.82 added because of release
153736
153737 $FreeTDS$
153738 -$Id: ChangeLog,v 1.3114 2010/08/18 11:27:46 freddy77 Exp $
153739 +$Id: ChangeLog,v 1.3115 2010/08/18 11:37:36 freddy77 Exp $
153740 diff --git a/misc/prepare_win32.sh b/misc/prepare_win32.sh
153741 index 595c4a9..14156c1 100755
153742 --- a/misc/prepare_win32.sh
153743 +++ b/misc/prepare_win32.sh
153744 @@ -14,13 +14,15 @@ errore() {
153745
153746 NTWDBLIB=no
153747 TYPE=win32
153748 +HOSTS='i386-mingw32 i586-mingw32msvc'
153749 ARCHIVE='tar jcvf "freetds-$PACKAGE_VERSION.$TYPE.tar.bz2" "freetds-$PACKAGE_VERSION"'
153750 PACK=yes
153751 +
153752 for param
153753 do
153754 case $param in
153755 --win64)
153756 - HOST=x86_64-pc-mingw32
153757 + HOSTS='x86_64-w64-mingw32 x86_64-pc-mingw32'
153758 TYPE=win64
153759 ;;
153760 --zip)
153761 @@ -52,11 +54,17 @@ do
153762 esac
153763 done
153764
153765 -if test "$TYPE" = "win32"; then
153766 - HOST=i386-mingw32
153767 - if ! $HOST-gcc --help > /dev/null 2> /dev/null; then
153768 - HOST=i586-mingw32msvc
153769 +# search valid HOST
153770 +HOST=
153771 +for h in $HOSTS; do
153772 + if $h-gcc --help > /dev/null 2> /dev/null; then
153773 + HOST=$h
153774 + break
153775 fi
153776 +done
153777 +if test x$HOST = x; then
153778 + echo "Valid host not found in $HOSTS" 1>&2
153779 + exit 1
153780 fi
153781
153782 PACKAGE_VERSION=
153783
153784 commit 3f70b636c27489b53c9cdad5ded356cf03b89e52
153785 Author: freddy77 <freddy77>
153786 Date: Wed Sep 1 08:39:38 2010 +0000
153787
153788 Remove warnings for MingW64
153789
153790 diff --git a/ChangeLog b/ChangeLog
153791 index 7a5621d..5f1fcf6 100644
153792 --- a/ChangeLog
153793 +++ b/ChangeLog
153794 @@ -1,3 +1,8 @@
153795 +Wed Sep 1 10:39:43 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
153796 + * include/tds_sysdep_public.h.in src/odbc/unittests/common.h:
153797 + * src/odbc/unittests/freeclose.c win32/winlogin.c win32/winsetup.c:
153798 + - Remove warnings for MingW64
153799 +
153800 Wed Aug 18 13:37:35 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
153801 * misc/prepare_win32.sh: search correct host
153802
153803 @@ -2840,4 +2845,4 @@ Wed Jan 9 19:54:43 EST 2008 JK Lowden <jklowden@freetds.org>
153804 * ChangeLog-0.82 added because of release
153805
153806 $FreeTDS$
153807 -$Id: ChangeLog,v 1.3115 2010/08/18 11:37:36 freddy77 Exp $
153808 +$Id: ChangeLog,v 1.3116 2010/09/01 08:39:38 freddy77 Exp $
153809 diff --git a/include/tds_sysdep_public.h.in b/include/tds_sysdep_public.h.in
153810 index 7e50ac0..45ed644 100644
153811 --- a/include/tds_sysdep_public.h.in
153812 +++ b/include/tds_sysdep_public.h.in
153813 @@ -20,7 +20,7 @@
153814 #ifndef _tds_sysdep_public_h_
153815 #define _tds_sysdep_public_h_
153816
153817 -/* $Id: tds_sysdep_public.h.in,v 1.13 2009/02/27 10:46:24 freddy77 Exp $ */
153818 +/* $Id: tds_sysdep_public.h.in,v 1.14 2010/09/01 08:39:38 freddy77 Exp $ */
153819
153820 #ifdef __cplusplus
153821 extern "C"
153822 @@ -31,6 +31,7 @@ extern "C"
153823 ** This is where platform-specific changes need to be made.
153824 */
153825 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
153826 +#include <winsock2.h>
153827 #include <windows.h>
153828 #define tds_sysdep_int16_type short /* 16-bit int */
153829 #define tds_sysdep_int32_type int /* 32-bit int */
153830 diff --git a/src/odbc/unittests/common.h b/src/odbc/unittests/common.h
153831 index b55a3b3..aee37cb 100644
153832 --- a/src/odbc/unittests/common.h
153833 +++ b/src/odbc/unittests/common.h
153834 @@ -1,4 +1,5 @@
153835 #ifdef _WIN32
153836 +#include <winsock2.h>
153837 #include <windows.h>
153838 #include <direct.h>
153839 #endif
153840 @@ -21,7 +22,7 @@
153841 #include <sql.h>
153842 #include <sqlext.h>
153843
153844 -static char rcsid_common_h[] = "$Id: common.h,v 1.34 2010/07/05 09:20:32 freddy77 Exp $";
153845 +static char rcsid_common_h[] = "$Id: common.h,v 1.35 2010/09/01 08:39:38 freddy77 Exp $";
153846 static void *no_unused_common_h_warn[] = { rcsid_common_h, no_unused_common_h_warn };
153847
153848 #ifndef HAVE_SQLLEN
153849 diff --git a/src/odbc/unittests/freeclose.c b/src/odbc/unittests/freeclose.c
153850 index f092f08..8f0df93 100644
153851 --- a/src/odbc/unittests/freeclose.c
153852 +++ b/src/odbc/unittests/freeclose.c
153853 @@ -52,7 +52,7 @@
153854
153855 #include "tds.h"
153856
153857 -static char software_version[] = "$Id: freeclose.c,v 1.13 2010/07/05 09:20:33 freddy77 Exp $";
153858 +static char software_version[] = "$Id: freeclose.c,v 1.14 2010/09/01 08:39:38 freddy77 Exp $";
153859 static void *no_unused_var_warn[] = { software_version, no_unused_var_warn };
153860
153861 /* this crazy test test that we do not send too much prepare ... */
153862 @@ -100,13 +100,15 @@ static TDS_SYS_SOCKET fake_sock;
153863 #ifndef _WIN32
153864 static pthread_t fake_thread;
153865 #define THREADAPI
153866 +#define THREADRET void*
153867 #else
153868 static HANDLE fake_thread;
153869 #define THREADAPI WINAPI
153870 +#define THREADRET DWORD
153871 #define pthread_join(th,fl) WaitForSingleObject(th,INFINITE)
153872 #define alarm(n) do { ; } while(0)
153873 #endif
153874 -static void* THREADAPI fake_thread_proc(void *arg);
153875 +static THREADRET THREADAPI fake_thread_proc(void *arg);
153876
153877 static int
153878 init_fake_server(int ip_port)
153879 @@ -211,7 +213,7 @@ count_insert(const char* buf, size_t len)
153880 static unsigned int round_trips = 0;
153881 static enum { sending, receiving } flow = sending;
153882
153883 -static void *THREADAPI
153884 +static THREADRET THREADAPI
153885 fake_thread_proc(void * arg)
153886 {
153887 TDS_SYS_SOCKET s = ptr2int(arg), server_sock;
153888 @@ -302,7 +304,7 @@ fake_thread_proc(void * arg)
153889 }
153890 CLOSESOCKET(fake_sock);
153891 CLOSESOCKET(server_sock);
153892 - return NULL;
153893 + return (THREADRET) 0;
153894 }
153895
153896 int
153897 diff --git a/win32/winlogin.c b/win32/winlogin.c
153898 index 540a48a..b67f7d7 100644
153899 --- a/win32/winlogin.c
153900 +++ b/win32/winlogin.c
153901 @@ -49,7 +49,6 @@
153902 #include <assert.h>
153903 #include <ctype.h>
153904 #include <assert.h>
153905 -#include <shlobj.h>
153906
153907 #include "resource.h"
153908
153909 @@ -59,6 +58,8 @@
153910 #include "tdsconvert.h"
153911 #include "replacements.h"
153912
153913 +#include <shlobj.h>
153914 +
153915 #ifdef DMALLOC
153916 #include <dmalloc.h>
153917 #endif
153918 diff --git a/win32/winsetup.c b/win32/winsetup.c
153919 index ac8ec3b..6c72b5d 100644
153920 --- a/win32/winsetup.c
153921 +++ b/win32/winsetup.c
153922 @@ -50,7 +50,6 @@
153923 #include <assert.h>
153924 #include <ctype.h>
153925 #include <assert.h>
153926 -#include <olectl.h>
153927
153928 #include "resource.h"
153929
153930 @@ -60,6 +59,8 @@
153931 #include "tdsconvert.h"
153932 #include "replacements.h"
153933
153934 +#include <olectl.h>
153935 +
153936 #ifdef DMALLOC
153937 #include <dmalloc.h>
153938 #endif