diff options
| -rw-r--r-- | external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch | 4 | ||||
| -rw-r--r-- | sal/textenc/generate/big5hkscs2001.pl | 2 | ||||
| -rw-r--r-- | sal/textenc/generate/big5hkscs2001.tab | 2 | ||||
| -rw-r--r-- | sal/textenc/generate/cns116431992.pl | 2 | ||||
| -rw-r--r-- | sal/textenc/generate/cns116431992.tab | 2 | ||||
| -rw-r--r-- | sal/textenc/generate/gb180302000.pl | 4 |
6 files changed, 1 insertions, 15 deletions
diff --git a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch index c7fd21b58ba5..ec439d2dfd56 100644 --- a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch +++ b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch @@ -1,13 +1,11 @@ --- misc/mysql-connector-c++-1.1.0/cppconn/build_config.h 2010-09-10 11:47:47.000000000 +0200 +++ misc/build/mysql-connector-c++-1.1.0/cppconn/build_config.h 2011-11-12 00:45:19.000000000 +0100 -@@ -25,25 +25,23 @@ +@@ -25,25 +25,21 @@ #ifndef _SQL_BUILD_CONFIG_H_ #define _SQL_BUILD_CONFIG_H_ -#ifndef CPPCONN_PUBLIC_FUNC -+#ifndef _SAL_TYPES_H_ +#include <sal/types.h> -+#endif -#if defined(_WIN32) // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only diff --git a/sal/textenc/generate/big5hkscs2001.pl b/sal/textenc/generate/big5hkscs2001.pl index 1ba83a692dba..8e7b700ca834 100644 --- a/sal/textenc/generate/big5hkscs2001.pl +++ b/sal/textenc/generate/big5hkscs2001.pl @@ -452,9 +452,7 @@ open OUT, ("> " . $filename) or die "Cannot write " . $filename; } print OUT "\n", - "#ifndef _SAL_TYPES_H_\n", "#include \"sal/types.h\"\n", - "#endif\n", "\n"; print OUT "static sal_uInt16 const aImpl", $id, "ToUnicodeData[] = {\n"; diff --git a/sal/textenc/generate/big5hkscs2001.tab b/sal/textenc/generate/big5hkscs2001.tab index b5d81a421a70..8eeff4d36b47 100644 --- a/sal/textenc/generate/big5hkscs2001.tab +++ b/sal/textenc/generate/big5hkscs2001.tab @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_TYPES_H_ #include "sal/types.h" -#endif static sal_uInt16 const aImplBig5Hkscs2001ToUnicodeData[] = { /* row 0: --- */ diff --git a/sal/textenc/generate/cns116431992.pl b/sal/textenc/generate/cns116431992.pl index af1b65deb9e8..833358136678 100644 --- a/sal/textenc/generate/cns116431992.pl +++ b/sal/textenc/generate/cns116431992.pl @@ -433,9 +433,7 @@ open OUT, ("> " . $filename) or die "Cannot write " . $filename; } print OUT "\n", - "#ifndef _SAL_TYPES_H_\n", "#include \"sal/types.h\"\n", - "#endif\n", "\n"; print OUT "static sal_uInt16 const aImpl", $id, "ToUnicodeData[] = {\n"; diff --git a/sal/textenc/generate/cns116431992.tab b/sal/textenc/generate/cns116431992.tab index 8f8a7cd5e39b..33d6c2669fbc 100644 --- a/sal/textenc/generate/cns116431992.tab +++ b/sal/textenc/generate/cns116431992.tab @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SAL_TYPES_H_ #include "sal/types.h" -#endif static sal_uInt16 const aImplCns116431992ToUnicodeData[] = { /* plane 1, row 1 */ diff --git a/sal/textenc/generate/gb180302000.pl b/sal/textenc/generate/gb180302000.pl index 410e7b6067f2..cc19187afa31 100644 --- a/sal/textenc/generate/gb180302000.pl +++ b/sal/textenc/generate/gb180302000.pl @@ -224,13 +224,9 @@ open OUT, ("> " . $filename) or die "Cannot write " . $filename; } print OUT "\n", - "#ifndef INCLUDED_RTL_TEXTENC_CONVERTGB18030_H\n", "#include \"convertgb18030.h\"\n", - "#endif\n", "\n", - "#ifndef _SAL_TYPES_H_\n", "#include \"sal/types.h\"\n", - "#endif\n", "\n"; print OUT "static sal_Unicode const aImpl", $id, "ToUnicodeData[] = {\n "; |