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

8 files changed, 7 insertions, 15 deletions

diff --git a/idlc/inc/idlc/astattribute.hxx b/idlc/inc/idlc/astattribute.hxx
index 6765d3c79638..173c393d912c 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 48dfef9161a6..a0e8eca502a9 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 a03b6ef99fbf..d8980985700c 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 a7e3fcf25385..3e3bedad8796 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
index 27eacb899967..dc28e9d5d47b 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 bf5b314816ba..e05b09634ede 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 f6dced52ffaa..023aa1ee2d70 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 64ad999816bb..95ed912e8b68 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"