Mercurial > mxe-octave

comparison src/freetds-1-fastforward.patch @ 1208:f6f994be9b4d

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 Tue, 28 Sep 2010 08:45:08 +0200
parents 0c8281632379
children 13265b91abc4
comparison
equal deleted inserted replaced
1207:de4ff9fbd0be 1208:f6f994be9b4d
155869 - else if (strcmp(enc_name, "UCS-2BE") == 0) 155869 - else if (strcmp(enc_name, "UCS-2BE") == 0)
155870 + else if (strcmp(enc_name, "UCS-2BE") == 0 || strcmp(enc_name, "UTF-16BE") == 0) 155870 + else if (strcmp(enc_name, "UCS-2BE") == 0 || strcmp(enc_name, "UTF-16BE") == 0)
155871 encoding = 3; 155871 encoding = 3;
155872 else if (strcmp(enc_name, "UCS-4LE") == 0) 155872 else if (strcmp(enc_name, "UCS-4LE") == 0)
155873 encoding = 4; 155873 encoding = 4;
155874
155875 commit 19ec31900bd23e3320284bd9b65b6942d471d93b
155876 Author: jklowden <jklowden>
155877 Date: Mon Sep 27 21:53:48 2010 +0000
155878
155879 fix Win32 problems
155880
155881 diff --git a/ChangeLog b/ChangeLog
155882 index 0c54ccd..1e2c386 100644
155883 --- a/ChangeLog
155884 +++ b/ChangeLog
155885 @@ -1,3 +1,7 @@
155886 +Mon Sep 27 17:53:10 EDT 2010 JK Lowden <jklowden@freetds.org>
155887 + * Nmakefile src/tds/config.c src/tds/mem.c
155888 + - fix Win32 problems
155889 +
155890 Mon Sep 27 09:25:08 CEST 2010 Frediano Ziglio <freddy77_A_gmail_D_com>
155891 * src/replacements/iconv.c: add utf16 support to iconv replacement
155892
155893 @@ -2909,4 +2913,4 @@ Wed Jan 9 19:54:43 EST 2008 JK Lowden <jklowden@freetds.org>
155894 * ChangeLog-0.82 added because of release
155895
155896 $FreeTDS$
155897 -$Id: ChangeLog,v 1.3131 2010/09/27 07:25:24 freddy77 Exp $
155898 +$Id: ChangeLog,v 1.3132 2010/09/27 21:53:48 jklowden Exp $
155899 diff --git a/Nmakefile b/Nmakefile
155900 index bc360ed..fbac636 100755
155901 --- a/Nmakefile
155902 +++ b/Nmakefile
155903 @@ -1,4 +1,4 @@
155904 -# $Id: Nmakefile,v 1.4 2010/01/26 18:15:39 jklowden Exp $
155905 +# $Id: Nmakefile,v 1.5 2010/09/27 21:53:48 jklowden Exp $
155906 # Build FreeTDS and assorted utilities for Win32/Win64 without an IDE.
155907 # Makefiles, unlike Visual Studio project files, are stable over time.
155908 # Contributed to the public domain by James K. Lowden, February 2009
155909 @@ -90,6 +90,7 @@ TDS_SRC = $(TDS_DIR)\bulk.c \
155910 $(TDS_DIR)\token.c \
155911 $(TDS_DIR)\util.c \
155912 $(TDS_DIR)\vstrbuild.c \
155913 + $(TDS_DIR)\win_mutex.c \
155914 $(TDS_DIR)\write.c
155915
155916 TDS_OBJ = $(TDS_OUT)\bulk.obj \
155917 @@ -119,6 +120,7 @@ TDS_OBJ = $(TDS_OUT)\bulk.obj \
155918 $(TDS_OUT)\token.obj \
155919 $(TDS_OUT)\util.obj \
155920 $(TDS_OUT)\vstrbuild.obj \
155921 + $(TDS_OUT)\win_mutex.obj \
155922 $(TDS_OUT)\write.obj
155923
155924 # not yet: $(APPS_DIR)\bsqlodbc.c
155925 @@ -250,7 +252,7 @@ REL = -MT -O2 -D "_NDEBUG" -Zi
155926
155927 MSLIBS = Ws2_32.lib shell32.lib
155928
155929 -CC = cl $(FLG) $(DEF) $(INC)
155930 +CC = cl $(CFLAGS) $(FLG) $(DEF) $(INC)
155931 CC32 = $(CC)
155932 CC64 = $(CC)
155933
155934 @@ -329,6 +331,8 @@ CC64 = $(CC)
155935 #
155936 # Utilities
155937 #
155938 +$(APPS_EXE): $(DBLIB_OUT)\db-lib.lib
155939 +
155940 {$(APPS_DIR)}.c{$(APPS_DIR)\win32\debug}.exe:
155941 @if not exist $(APPS_OUT) $(MKDIR) $(APPS_OUT)
155942 $(CC32) $(DBG) -Fd"$(APPS_OUT)\vc80.pdb" -Fe$@ \
155943 diff --git a/src/tds/config.c b/src/tds/config.c
155944 index 357f958..b079351 100644
155945 --- a/src/tds/config.c
155946 +++ b/src/tds/config.c
155947 @@ -80,7 +80,7 @@
155948 #include <dmalloc.h>
155949 #endif
155950
155951 -TDS_RCSID(var, "$Id: config.c,v 1.160 2010/09/16 07:37:23 freddy77 Exp $");
155952 +TDS_RCSID(var, "$Id: config.c,v 1.161 2010/09/27 21:53:48 jklowden Exp $");
155953
155954 static void tds_config_login(TDSCONNECTION * connection, TDSLOGIN * login);
155955 static void tds_config_env_tdsdump(TDSCONNECTION * connection);
155956 @@ -768,6 +768,8 @@ tds_config_verstr(const char *tdsver, TDSCONNECTION * connection)
155957 if (connection)
155958 connection->tds_version = version;
155959
155960 + tdsdump_log(TDS_DBG_INFO1, "Setting tds version to %s (0x%0x) from $TDSVER.\n", tdsver, version);
155961 +
155962 return version;
155963 }
155964
155965 diff --git a/src/tds/mem.c b/src/tds/mem.c
155966 index 9ad97cb..dbd6414 100644
155967 --- a/src/tds/mem.c
155968 +++ b/src/tds/mem.c
155969 @@ -53,7 +53,7 @@
155970 #include <dmalloc.h>
155971 #endif
155972
155973 -TDS_RCSID(var, "$Id: mem.c,v 1.206 2010/07/27 08:53:12 freddy77 Exp $");
155974 +TDS_RCSID(var, "$Id: mem.c,v 1.207 2010/09/27 21:53:48 jklowden Exp $");
155975
155976 static void tds_free_env(TDSSOCKET * tds);
155977 static void tds_free_compute_results(TDSSOCKET * tds);
155978 @@ -860,7 +860,6 @@ tds_alloc_connection(TDSLOCALE * locale)
155979 if (encoding && atoi(encoding) > 0) {
155980 char *p;
155981 if (asprintf(&p, "CP%s", encoding) >= 0) {
155982 - free(encoding);
155983 lc_all = encoding = p;
155984 }
155985 }