summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-19 12:49:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-19 13:01:37 +0100
commit299a8a50d30465d6a93b0992aaf74944404da585 (patch)
tree91fe050b3d85fbc2ccb97418b8611a6e7cb595a2
parente5f0aceba796b6ebb84ab1b4a8fde3267e6d3e8d (diff)
saltime.h -> saltime.hxx
Change-Id: I930c581525ed5b02dd8850e9781b01eed12c857f
-rw-r--r--sal/osl/unx/salinit.cxx2
-rw-r--r--sal/osl/unx/saltime.hxx (renamed from sal/osl/unx/saltime.h)12
-rw-r--r--sal/osl/unx/time.cxx2
3 files changed, 4 insertions, 12 deletions
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 832fa8b39e57..64ca6e67118e 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -32,7 +32,7 @@
#include "sal/main.h"
#include "sal/types.h"
-#include <saltime.h>
+#include <saltime.hxx>
#if HAVE_SYSLOG_H
#include <string.h>
diff --git a/sal/osl/unx/saltime.h b/sal/osl/unx/saltime.hxx
index 735be7868d4b..e72e09b43f89 100644
--- a/sal/osl/unx/saltime.h
+++ b/sal/osl/unx/saltime.hxx
@@ -17,21 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SAL_OSL_UNX_SALTIME_H
-#define INCLUDED_SAL_OSL_UNX_SALTIME_H
+#ifndef INCLUDED_SAL_OSL_UNX_SALTIME_HXX
+#define INCLUDED_SAL_OSL_UNX_SALTIME_HXX
#include <sal/config.h>
-#if defined __cplusplus
-extern "C" {
-#endif
-
void sal_initGlobalTimer(void);
-#if defined __cplusplus
-}
-#endif
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/time.cxx b/sal/osl/unx/time.cxx
index c474af6c1dd8..aba39d525b79 100644
--- a/sal/osl/unx/time.cxx
+++ b/sal/osl/unx/time.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
-#include "saltime.h"
+#include "saltime.hxx"
#include "system.h"
#include <osl/diagnose.h>