Rebase against a3209daea543104fbfac5900bf9ec0c05a0a43fc.

patches/odbc-remove-unixodbc/0001-odbc32-Remove-unixODBC-support.patch

@@ -1,7 +1,7 @@
-From de6ee9b0358cb5d6464808751a9d33ed0564afcd Mon Sep 17 00:00:00 2001
+From d5d4bf5bd38c5567ea475c6528120fdc44b0f7f6 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 2 Feb 2023 14:20:44 +1100
-Subject: [PATCH 01/42] odbc32: Remove unixODBC support
+Subject: [PATCH] odbc32: Remove unixODBC support
 
 ---
  configure.ac            |    3 -
@@ -15,10 +15,10 @@ Subject: [PATCH 01/42] odbc32: Remove unixODBC support
  delete mode 100644 dlls/odbc32/unixlib.h
 
 diff --git a/configure.ac b/configure.ac
-index 590ef29eb35..1033af2e613 100644
+index 603aadf2924..ba80dfe58f8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1768,9 +1768,6 @@ then
+@@ -1796,9 +1796,6 @@ then
                    AC_SUBST(PROCSTAT_LIBS,"-lprocstat")])
  fi
  
@@ -29,18 +29,16 @@ index 590ef29eb35..1033af2e613 100644
  if test "x$with_netapi" != "xno"
  then
 diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
-index def7b4b5d67..3d644700c08 100644
+index 44962ca4896..65d481facd9 100644
 --- a/dlls/odbc32/Makefile.in
 +++ b/dlls/odbc32/Makefile.in
-@@ -4,7 +4,6 @@ IMPORTLIB = odbc32
- IMPORTS   = advapi32
+@@ -5,5 +5,4 @@ IMPORTS   = advapi32
  
- C_SRCS = \
--	proxyodbc.c \
+ SOURCES = \
+ 	proxyodbc.c \
+-	rsrc.rc \
 -	unixlib.c
-+	proxyodbc.c
- 
- RC_SRCS = rsrc.rc
++	rsrc.rc
 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
 index 679f3d7380e..e8574430e74 100644
 --- a/dlls/odbc32/proxyodbc.c
@@ -4189,10 +4187,10 @@ index 13ce8d0883b..00000000000
 -struct SQLTablesW_params { SQLHSTMT StatementHandle; SQLWCHAR *CatalogName; SQLSMALLINT NameLength1; SQLWCHAR *SchemaName; SQLSMALLINT NameLength2; SQLWCHAR *TableName; SQLSMALLINT NameLength3; SQLWCHAR *TableType; SQLSMALLINT NameLength4; };
 -struct SQLTransact_params { SQLHENV EnvironmentHandle; SQLHDBC ConnectionHandle; SQLUSMALLINT CompletionType; };
 diff --git a/include/config.h.in b/include/config.h.in
-index 933197b6f7d..617e2856255 100644
+index 4461fb060cb..1a8d0385fd5 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -795,9 +795,6 @@
+@@ -762,9 +762,6 @@
  /* Define to the soname of the libnetapi library. */
  #undef SONAME_LIBNETAPI
  
@@ -4203,5 +4201,5 @@ index 933197b6f7d..617e2856255 100644
  #undef SONAME_LIBOSMESA
  
 -- 
-2.39.1
+2.42.0