Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/unixodbc/patches/002-odbc-config.c.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 253 425c6a23679f
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- exe/odbc-config.c	2009-12-11 08:54:07.000000000 -0800
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
+++ exe/odbc-config.c	2011-05-16 11:46:12.131107392 -0700
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -50,6 +50,7 @@
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
 static void cInc( void )
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
 
 {
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
+    printf( "#ifndef UODBC__conf_h\n#define UODBC__conf_h 1\n\n");
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
 #ifdef HAVE_UNISTD_H
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
     printf( "#ifndef HAVE_UNISTD_H\n #define HAVE_UNISTD_H\n#endif\n" );
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
 #endif
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
@@ -83,11 +84,11 @@
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
 #endif
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
 #ifdef ODBCINT64_TYPE
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
-    printf( "#ifndef ODBCINT64\n #define ODBCINT64 %s\n#endif\n", ODBCINT64_TYPE );
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
+    printf( "#ifndef ODBCINT64\n#if defined(__amd64) || defined(__sparcv9)\n #define ODBCINT64 long\n#else\n #define ODBCINT64 long long\n#endif\n#endif\n" );
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
 #endif
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    19
 
 #ifdef UODBCINT64_TYPE
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
-    printf( "#ifndef UODBCINT64\n #define UODBCINT64 %s\n#endif\n", UODBCINT64_TYPE );
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
+    printf( "#ifndef UODBCINT64\n#if defined(__amd64) || defined(__sparcv9)\n #define ODBCINT64 unsigned long\n#else\n #define UODBCINT64 unsigned long long \n#endif\n#endif\n" );
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
 #endif
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
 #ifdef DISABLE_INI_CACHING
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
@@ -95,7 +96,7 @@
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    26
 
 #endif
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
 
 #ifdef SIZEOF_LONG_INT
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
-    printf( "#ifndef SIZEOF_LONG_INT\n #define SIZEOF_LONG_INT %d\n#endif\n", SIZEOF_LONG_INT );
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
+    printf( "#ifndef SIZEOF_LONG_INT\n#if defined(__amd64) || defined(__sparcv9)\n #define SIZEOF_LONG_INT 8\n#else\n #define SIZEOF_LONG_INT 4\n#endif\n#endif\n" );
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
 #endif
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
 #ifdef ALLREADY_HAVE_WINDOWS_TYPE
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
@@ -109,6 +110,7 @@
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
 #ifdef DO_YOU_KNOW_WHAT_YOUR_ARE_DOING
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
     printf( "#ifndef DO_YOU_KNOW_WHAT_YOUR_ARE_DOING\n #define DO_YOU_KNOW_WHAT_YOUR_ARE_DOING\n#endif\n" );
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
 #endif
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    38
 
+    printf ("\n#endif /* UODBC__conf_h */\n");
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
 }
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    41
 
 static void cflags( void )
upstream/oracle/userland-gate