mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some external header guards

Browse Source 
Change-Id: I5a51dc496835f0998a3422f2a1f0f2ff8bb3c13f
This commit is contained in:
Thomas Arnhold 2014-05-18 11:50:02 +02:00
parent 3c56e0b8f0
commit 70fc3a299c
6 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch vendored
View File

@ -1,13 +1,11 @@
--- misc/mysql-connector-c++-1.1.0/cppconn/build_config.h 2010-09-10 11:47:47.000000000 +0200 --- 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 +++ 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_ #ifndef _SQL_BUILD_CONFIG_H_
#define _SQL_BUILD_CONFIG_H_ #define _SQL_BUILD_CONFIG_H_
-#ifndef CPPCONN_PUBLIC_FUNC -#ifndef CPPCONN_PUBLIC_FUNC
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h> +#include <sal/types.h>
+#endif
-#if defined(_WIN32) -#if defined(_WIN32)
// mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only

2
sal/textenc/generate/big5hkscs2001.pl
View File

@ -452,9 +452,7 @@ open OUT, ("> " . $filename) or die "Cannot write " . $filename;
} }
print OUT "\n", print OUT "\n",
"#ifndef _SAL_TYPES_H_\n",
"#include \"sal/types.h\"\n", "#include \"sal/types.h\"\n",
"#endif\n",
"\n"; "\n";
print OUT "static sal_uInt16 const aImpl", $id, "ToUnicodeData[] = {\n"; print OUT "static sal_uInt16 const aImpl", $id, "ToUnicodeData[] = {\n";

2
sal/textenc/generate/big5hkscs2001.tab
View File

@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifndef _SAL_TYPES_H_
#include "sal/types.h" #include "sal/types.h"
#endif
static sal_uInt16 const aImplBig5Hkscs2001ToUnicodeData[] = { static sal_uInt16 const aImplBig5Hkscs2001ToUnicodeData[] = {
/* row 0: --- */ /* row 0: --- */

2
sal/textenc/generate/cns116431992.pl
View File

@ -433,9 +433,7 @@ open OUT, ("> " . $filename) or die "Cannot write " . $filename;
} }
print OUT "\n", print OUT "\n",
"#ifndef _SAL_TYPES_H_\n",
"#include \"sal/types.h\"\n", "#include \"sal/types.h\"\n",
"#endif\n",
"\n"; "\n";
print OUT "static sal_uInt16 const aImpl", $id, "ToUnicodeData[] = {\n"; print OUT "static sal_uInt16 const aImpl", $id, "ToUnicodeData[] = {\n";

2
sal/textenc/generate/cns116431992.tab
View File

@ -16,9 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifndef _SAL_TYPES_H_
#include "sal/types.h" #include "sal/types.h"
#endif
static sal_uInt16 const aImplCns116431992ToUnicodeData[] = { static sal_uInt16 const aImplCns116431992ToUnicodeData[] = {
/* plane 1, row 1 */ /* plane 1, row 1 */

4
sal/textenc/generate/gb180302000.pl
View File

@ -224,13 +224,9 @@ open OUT, ("> " . $filename) or die "Cannot write " . $filename;
} }
print OUT "\n", print OUT "\n",
"#ifndef INCLUDED_RTL_TEXTENC_CONVERTGB18030_H\n",
"#include \"convertgb18030.h\"\n", "#include \"convertgb18030.h\"\n",
"#endif\n",
"\n", "\n",
"#ifndef _SAL_TYPES_H_\n",
"#include \"sal/types.h\"\n", "#include \"sal/types.h\"\n",
"#endif\n",
"\n"; "\n";
print OUT "static sal_Unicode const aImpl", $id, "ToUnicodeData[] = {\n "; print OUT "static sal_Unicode const aImpl", $id, "ToUnicodeData[] = {\n ";