Kaydet (Commit) 30f3b36e authored tarafından Michael Stahl's avatar Michael Stahl

sal: remove pointless checking for __cplusplus in public C++ headers

Change-Id: Ibbcdb4a3f46b7491396a1b1c7b4cdc1af05f30d3
üst b3e5b594
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#ifndef INCLUDED_OSL_CONDITN_HXX #ifndef INCLUDED_OSL_CONDITN_HXX
#define INCLUDED_OSL_CONDITN_HXX #define INCLUDED_OSL_CONDITN_HXX
#ifdef __cplusplus
#include <osl/time.h> #include <osl/time.h>
#include <osl/conditn.h> #include <osl/conditn.h>
...@@ -122,7 +120,6 @@ namespace osl ...@@ -122,7 +120,6 @@ namespace osl
} }
#endif /* __cplusplus */
#endif // INCLUDED_OSL_CONDITN_HXX #endif // INCLUDED_OSL_CONDITN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#ifndef INCLUDED_OSL_MUTEX_HXX #ifndef INCLUDED_OSL_MUTEX_HXX
#define INCLUDED_OSL_MUTEX_HXX #define INCLUDED_OSL_MUTEX_HXX
#ifdef __cplusplus
#include <osl/mutex.h> #include <osl/mutex.h>
...@@ -240,7 +238,6 @@ namespace osl ...@@ -240,7 +238,6 @@ namespace osl
typedef ResettableGuard< Mutex > ResettableMutexGuard; typedef ResettableGuard< Mutex > ResettableMutexGuard;
} }
#endif /* __cplusplus */
#endif // INCLUDED_OSL_MUTEX_HXX #endif // INCLUDED_OSL_MUTEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -33,8 +33,6 @@ ...@@ -33,8 +33,6 @@
#include <rtl/stringconcat.hxx> #include <rtl/stringconcat.hxx>
#endif #endif
#ifdef __cplusplus
// The unittest uses slightly different code to help check that the proper // The unittest uses slightly different code to help check that the proper
// calls are made. The class is put into a different namespace to make // calls are made. The class is put into a different namespace to make
// sure the compiler generates a different (if generating also non-inline) // sure the compiler generates a different (if generating also non-inline)
...@@ -974,7 +972,6 @@ typedef rtlunittest::OStringBuffer OStringBuffer; ...@@ -974,7 +972,6 @@ typedef rtlunittest::OStringBuffer OStringBuffer;
using ::rtl::OStringBuffer; using ::rtl::OStringBuffer;
#endif #endif
#endif /* __cplusplus */
#endif // INCLUDED_RTL_STRBUF_HXX #endif // INCLUDED_RTL_STRBUF_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