[Libreoffice-commits] core.git: 3 commits - external/mysqlcppconn include/sal sal/textenc

[Thomas Arnhold]

 external/mysqlcppconn/README                                  |    2 +-
 external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch |    4 +---
 include/sal/types.h                                           |    6 +++---
 sal/textenc/generate/big5hkscs2001.pl                         |    2 --
 sal/textenc/generate/big5hkscs2001.tab                        |    2 --
 sal/textenc/generate/cns116431992.pl                          |    2 --
 sal/textenc/generate/cns116431992.tab                         |    2 --
 sal/textenc/generate/gb180302000.pl                           |    4 ----
 8 files changed, 5 insertions(+), 19 deletions(-)

New commits:
commit 8899e449b75ce4c0fd191d18ab00e11f3f88e365
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun May 18 11:56:51 2014 +0200

    fix include guard for sal/types.h
    
    Change-Id: I77e10d2644b18b150f9489c7f754405974af107a

diff --git a/include/sal/types.h b/include/sal/types.h
index 8668cd5..5a534b8 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SAL_TYPES_H_
-#define _SAL_TYPES_H_
+#ifndef INCLUDED_SAL_TYPES_H
+#define INCLUDED_SAL_TYPES_H
 
 #include <sal/config.h>
 #include <sal/macros.h>
@@ -603,6 +603,6 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
 #define SAL_WARN_UNUSED
 #endif
 
-#endif /*_SAL_TYPES_H_ */
+#endif // INCLUDED_SAL_TYPES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 70fc3a299c2adb2711e13fe07ac73b827a54bbed
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun May 18 11:50:02 2014 +0200

    remove some external header guards
    
    Change-Id: I5a51dc496835f0998a3422f2a1f0f2ff8bb3c13f

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 c7fd21b..ec439d2 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 1ba83a6..8e7b700 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 b5d81a4..8eeff4d 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 af1b65d..8333581 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 8f8a7cd..33d6c26 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 410e7b6..cc19187 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  ";
commit 3c56e0b8f062e378c0ef87dd41252c2271c1f8ae
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Sun May 18 11:41:55 2014 +0200

    update mysqlcppconn url
    
    Change-Id: I96579ed4be05cc22bc66f80bd39d7af961d47470

diff --git a/external/mysqlcppconn/README b/external/mysqlcppconn/README
index fb62078..b49803d 100644
--- a/external/mysqlcppconn/README
+++ b/external/mysqlcppconn/README
@@ -1 +1 @@
-From [http://forge.mysql.com/wiki/Connector_C%2B%2B]
+From [http://dev.mysql.com/downloads/connector/cpp/]