idlc/inc/idlc/astattribute.hxx | 2
include/registry/reader.h | 2
include/registry/reader.hxx | 2
include/registry/refltype.hxx | 2
include/registry/types.h | 340 -----------------------------------------
include/registry/types.hxx | 332 ++++++++++++++++++++++++++++++++++++++++
include/registry/writer.h | 2
include/registry/writer.hxx | 2
registry/source/regimpl.cxx | 2
9 files changed, 339 insertions(+), 347 deletions(-)
New commits:
commit f1e22f1a051c44a55759b7d44b0f0ef1b6f3c9de
Author: Noel Grandin <n...@peralex.com>
Date: Thu Apr 9 09:09:19 2015 +0200
fix android build
since after my converting stuff in include/registry/types.h to use 'enum
class', it can obviously no longer be "extern C", so drop the "extern C"
and rename the file to reflect that.
Change-Id: Ia30f5731316525e48531c4785ab7471a428bcf6f
diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index 6765d3c7..173c393 100644
--- a/idlc/inc/idlc/astattribute.hxx
+++ b/idlc/inc/idlc/astattribute.hxx
@@ -22,7 +22,7 @@
#include <idlc/astdeclaration.hxx>
#include "idlc/astscope.hxx"
-#include <registry/types.h>
+#include <registry/types.hxx>
#include <rtl/ustring.hxx>
namespace typereg { class Writer; }
diff --git a/include/registry/reader.h b/include/registry/reader.h
index 48dfef9..a0e8eca 100644
--- a/include/registry/reader.h
+++ b/include/registry/reader.h
@@ -21,7 +21,7 @@
#define INCLUDED_REGISTRY_READER_H
#include <registry/regdllapi.h>
-#include <registry/types.h>
+#include <registry/types.hxx>
#include <registry/version.h>
#include <rtl/ustring.h>
diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx
index a03b6ef..d898098 100644
--- a/include/registry/reader.hxx
+++ b/include/registry/reader.hxx
@@ -22,7 +22,7 @@
#include <registry/reader.h>
#include <registry/refltype.hxx>
-#include <registry/types.h>
+#include <registry/types.hxx>
#include <registry/version.h>
#include <rtl/ustring.hxx>
diff --git a/include/registry/refltype.hxx b/include/registry/refltype.hxx
index a7e3fcf..3e3beda 100644
--- a/include/registry/refltype.hxx
+++ b/include/registry/refltype.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_REGISTRY_REFLTYPE_HXX
#define INCLUDED_REGISTRY_REFLTYPE_HXX
-#include <registry/types.h>
+#include <registry/types.hxx>
#include <sal/types.h>
/** specifies the type source of a binary type blob.
diff --git a/include/registry/types.h b/include/registry/types.hxx
similarity index 99%
rename from include/registry/types.h
rename to include/registry/types.hxx
index 27eacb8..dc28e9d 100644
--- a/include/registry/types.h
+++ b/include/registry/types.hxx
@@ -23,10 +23,6 @@
#include <sal/types.h>
#include <o3tl/typed_flags_set.hxx>
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/** specifies the typeclass of a binary type blob.
The general structure of a binary type blob is always the same. It depends
@@ -331,10 +327,6 @@ enum class RTReferenceType {
TYPE_PARAMETER
};
-#ifdef __cplusplus
-}
-#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/registry/writer.h b/include/registry/writer.h
index bf5b314..e05b096 100644
--- a/include/registry/writer.h
+++ b/include/registry/writer.h
@@ -21,7 +21,7 @@
#define INCLUDED_REGISTRY_WRITER_H
#include <registry/regdllapi.h>
-#include <registry/types.h>
+#include <registry/types.hxx>
#include <registry/version.h>
#include <rtl/ustring.h>
diff --git a/include/registry/writer.hxx b/include/registry/writer.hxx
index f6dced5..023aa1e 100644
--- a/include/registry/writer.hxx
+++ b/include/registry/writer.hxx
@@ -22,7 +22,7 @@
#include <registry/writer.h>
#include <registry/refltype.hxx>
-#include <registry/types.h>
+#include <registry/types.hxx>
#include <registry/version.h>
#include <rtl/ustring.hxx>
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 64ad999..95ed912 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -37,7 +37,7 @@
#include "registry/reader.hxx"
#include "registry/refltype.hxx"
-#include "registry/types.h"
+#include "registry/types.hxx"
#include "registry/version.h"
#include "reflcnst.hxx"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
