Kaydet (Commit) f1e22f1a authored tarafından Noel Grandin's avatar Noel Grandin

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
üst 6124ad4c
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <idlc/astdeclaration.hxx> #include <idlc/astdeclaration.hxx>
#include "idlc/astscope.hxx" #include "idlc/astscope.hxx"
#include <registry/types.h> #include <registry/types.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
namespace typereg { class Writer; } namespace typereg { class Writer; }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_REGISTRY_READER_H #define INCLUDED_REGISTRY_READER_H
#include <registry/regdllapi.h> #include <registry/regdllapi.h>
#include <registry/types.h> #include <registry/types.hxx>
#include <registry/version.h> #include <registry/version.h>
#include <rtl/ustring.h> #include <rtl/ustring.h>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <registry/reader.h> #include <registry/reader.h>
#include <registry/refltype.hxx> #include <registry/refltype.hxx>
#include <registry/types.h> #include <registry/types.hxx>
#include <registry/version.h> #include <registry/version.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef INCLUDED_REGISTRY_REFLTYPE_HXX #ifndef INCLUDED_REGISTRY_REFLTYPE_HXX
#define INCLUDED_REGISTRY_REFLTYPE_HXX #define INCLUDED_REGISTRY_REFLTYPE_HXX
#include <registry/types.h> #include <registry/types.hxx>
#include <sal/types.h> #include <sal/types.h>
/** specifies the type source of a binary type blob. /** specifies the type source of a binary type blob.
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
#include <sal/types.h> #include <sal/types.h>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
#ifdef __cplusplus
extern "C" {
#endif
/** specifies the typeclass of a binary type blob. /** specifies the typeclass of a binary type blob.
The general structure of a binary type blob is always the same. It depends The general structure of a binary type blob is always the same. It depends
...@@ -331,10 +327,6 @@ enum class RTReferenceType { ...@@ -331,10 +327,6 @@ enum class RTReferenceType {
TYPE_PARAMETER TYPE_PARAMETER
}; };
#ifdef __cplusplus
}
#endif
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_REGISTRY_WRITER_H #define INCLUDED_REGISTRY_WRITER_H
#include <registry/regdllapi.h> #include <registry/regdllapi.h>
#include <registry/types.h> #include <registry/types.hxx>
#include <registry/version.h> #include <registry/version.h>
#include <rtl/ustring.h> #include <rtl/ustring.h>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <registry/writer.h> #include <registry/writer.h>
#include <registry/refltype.hxx> #include <registry/refltype.hxx>
#include <registry/types.h> #include <registry/types.hxx>
#include <registry/version.h> #include <registry/version.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "registry/reader.hxx" #include "registry/reader.hxx"
#include "registry/refltype.hxx" #include "registry/refltype.hxx"
#include "registry/types.h" #include "registry/types.hxx"
#include "registry/version.h" #include "registry/version.h"
#include "reflcnst.hxx" #include "reflcnst.hxx"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment