mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
- Fix ODBCINT64 and UODBCINT64 definitions in unixodbc_conf.h
Patch is taken from unixODBC CVS repository. Approved by: MAINTAINER
This commit is contained in:
parent
604f8ce314
commit
14681a6608
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=226943
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= unixODBC
|
||||
PORTVERSION= 2.2.14
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= http://www.unixodbc.org/
|
||||
|
||||
|
19
databases/unixODBC/files/patch-exe-odbc-config.c
Normal file
19
databases/unixODBC/files/patch-exe-odbc-config.c
Normal file
@ -0,0 +1,19 @@
|
||||
--- exe/odbc-config.c.orig 2008/05/20 13:43:47 1.7
|
||||
+++ exe/odbc-config.c 2008/11/27 13:44:43 1.8
|
||||
@@ -66,12 +66,12 @@
|
||||
printf( "#ifndef HAVE_LONG_LONG\n #define HAVE_LONG_LONG\n#endif\n" );
|
||||
#endif
|
||||
|
||||
-#ifdef ODBCINT64
|
||||
- printf( "#ifndef ODBCINT64\n #define ODBCINT64\n#endif\n" );
|
||||
+#ifdef ODBCINT64_TYPE
|
||||
+ printf( "#ifndef ODBCINT64\n #define ODBCINT64 %s\n#endif\n", ODBCINT64_TYPE );
|
||||
#endif
|
||||
|
||||
-#ifdef UODBCINT64
|
||||
- printf( "#ifndef UODBCINT64\n #define UODBCINT64\n#endif\n" );
|
||||
+#ifdef UODBCINT64_TYPE
|
||||
+ printf( "#ifndef UODBCINT64\n #define UODBCINT64 %s\n#endif\n", UODBCINT64_TYPE );
|
||||
#endif
|
||||
|
||||
#ifdef DISABLE_INI_CACHING
|
35
databases/unixODBC/files/patch-include-sqltypes.h
Normal file
35
databases/unixODBC/files/patch-include-sqltypes.h
Normal file
@ -0,0 +1,35 @@
|
||||
--- include/sqltypes.h.orig 2008/10/31 16:22:18 1.26
|
||||
+++ include/sqltypes.h 2008/11/27 13:44:43 1.27
|
||||
@@ -49,7 +49,7 @@
|
||||
*/
|
||||
|
||||
#ifndef SIZEOF_LONG_INT
|
||||
-#include <unixodbc_conf.h>
|
||||
+#include "unixodbc_conf.h"
|
||||
#endif
|
||||
|
||||
#ifndef SIZEOF_LONG_INT
|
||||
@@ -371,10 +371,14 @@
|
||||
# if (SIZEOF_LONG_INT == 8)
|
||||
# define ODBCINT64 long
|
||||
# define UODBCINT64 unsigned long
|
||||
+# define ODBCINT64_TYPE "long"
|
||||
+# define UODBCINT64_TYPE "unsigned long"
|
||||
# else
|
||||
# ifdef HAVE_LONG_LONG
|
||||
# define ODBCINT64 long long
|
||||
# define UODBCINT64 unsigned long long
|
||||
+# define ODBCINT64_TYPE "long long"
|
||||
+# define UODBCINT64_TYPE "unsigned long long"
|
||||
# else
|
||||
/*
|
||||
* may fail in some cases, but what else can we do ?
|
||||
@@ -391,6 +395,8 @@
|
||||
};
|
||||
# define ODBCINT64 struct __bigint_struct
|
||||
# define UODBCINT64 struct __bigint_struct_u
|
||||
+# define ODBCINT64_TYPE "struct __bigint_struct"
|
||||
+# define UODBCINT64_TYPE "struct __bigint_struct_u"
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user