[Libreoffice-commits] core.git: sal/osl
Stephan Bergmann
sbergman at redhat.com
Wed Nov 19 08:12:33 PST 2014
sal/osl/unx/conditn.cxx | 2
sal/osl/unx/file.cxx | 2
sal/osl/unx/file_misc.cxx | 2
sal/osl/unx/file_stat.cxx | 2
sal/osl/unx/file_url.cxx | 2
sal/osl/unx/file_volume.cxx | 2
sal/osl/unx/interlck.cxx | 2
sal/osl/unx/module.cxx | 2
sal/osl/unx/mutex.cxx | 2
sal/osl/unx/nlsupport.cxx | 2
sal/osl/unx/pipe.cxx | 2
sal/osl/unx/process.cxx | 2
sal/osl/unx/profile.cxx | 2
sal/osl/unx/readwrite_helper.cxx | 2
sal/osl/unx/security.cxx | 2
sal/osl/unx/signal.cxx | 2
sal/osl/unx/socket.cxx | 2
sal/osl/unx/system.cxx | 2
sal/osl/unx/system.h | 409 ---------------------------------------
sal/osl/unx/system.hxx | 403 ++++++++++++++++++++++++++++++++++++++
sal/osl/unx/tempfile.cxx | 2
sal/osl/unx/thread.cxx | 2
sal/osl/unx/time.cxx | 2
sal/osl/unx/uunxapi.cxx | 2
24 files changed, 425 insertions(+), 431 deletions(-)
New commits:
commit af66914c1151533ced12bca6e8a7ec14348bdb9e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 19 17:12:03 2014 +0100
system.h -> system.hxx
Change-Id: I39a60d0b775bfe40fa89e8b5d5f7466d0db5d36e
diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx
index 36fd44a..1ba0f84 100644
--- a/sal/osl/unx/conditn.cxx
+++ b/sal/osl/unx/conditn.cxx
@@ -21,7 +21,7 @@
#include <assert.h>
-#include "system.h"
+#include "system.hxx"
#include <sal/log.hxx>
#include <sal/types.h>
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index a8b004b..659526b 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -30,7 +30,7 @@
#include <sal/log.hxx>
-#include "system.h"
+#include "system.hxx"
#include "createfilehandlefromfd.hxx"
#include "file_error_transl.hxx"
#include "file_impl.hxx"
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 658e0a6..44095fa 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -26,7 +26,7 @@
#include "rtl/alloc.h"
#include <rtl/string.hxx>
-#include "system.h"
+#include "system.hxx"
#include "file_impl.hxx"
#include "file_error_transl.hxx"
#include "file_path_helper.hxx"
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index c589e40..ab61199 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -19,7 +19,7 @@
#include "osl/file.h"
-#include "system.h"
+#include "system.hxx"
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 1ce6424..30c03ba 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -19,7 +19,7 @@
#include "file_url.hxx"
-#include "system.h"
+#include "system.hxx"
#include <limits.h>
#include <errno.h>
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index c530eb0..f99092d 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -25,7 +25,7 @@
#include "file_error_transl.hxx"
#include "file_url.hxx"
-#include "system.h"
+#include "system.hxx"
#include <errno.h>
#include <limits.h>
diff --git a/sal/osl/unx/interlck.cxx b/sal/osl/unx/interlck.cxx
index 025d8dc..01e8da4 100644
--- a/sal/osl/unx/interlck.cxx
+++ b/sal/osl/unx/interlck.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "system.h"
+#include "system.hxx"
#include <osl/interlck.h>
#include <osl/diagnose.h>
diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
index cb0e763..e8ae7b5 100644
--- a/sal/osl/unx/module.cxx
+++ b/sal/osl/unx/module.cxx
@@ -26,7 +26,7 @@
#include <osl/process.h>
#include <osl/file.h>
#include <assert.h>
-#include "system.h"
+#include "system.hxx"
#include "file_url.hxx"
#ifdef AIX
diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx
index 62f212f..5898622 100644
--- a/sal/osl/unx/mutex.cxx
+++ b/sal/osl/unx/mutex.cxx
@@ -23,7 +23,7 @@
#define _GNU_SOURCE 1
#endif
#endif
-#include "system.h"
+#include "system.hxx"
#include <osl/mutex.h>
#include <osl/diagnose.h>
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index a7e7640..93cc859 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -836,7 +836,7 @@ rtl_TextEncoding osl_getTextEncodingFromLocale( rtl_Locale * pLocale )
}
#if defined(MACOSX) || defined(IOS)
-#include "system.h"
+#include "system.hxx"
/*****************************************************************************
return the current process locale
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index 12e9b6a..b1b5a76 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "system.h"
+#include "system.hxx"
#include <osl/pipe.h>
#include <osl/diagnose.h>
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 537b1eb..7355ac97 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -40,7 +40,7 @@
#include <machine/param.h>
#endif
-#include "system.h"
+#include "system.hxx"
#if defined(SOLARIS)
# include <sys/procfs.h>
#endif
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index a47bdbc..6c54f6a 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "system.h"
+#include "system.hxx"
#include "readwrite_helper.hxx"
#include "file_url.hxx"
diff --git a/sal/osl/unx/readwrite_helper.cxx b/sal/osl/unx/readwrite_helper.cxx
index 9497128..68caa17 100644
--- a/sal/osl/unx/readwrite_helper.cxx
+++ b/sal/osl/unx/readwrite_helper.cxx
@@ -10,7 +10,7 @@
#include "readwrite_helper.hxx"
#include <osl/diagnose.h>
-#include <system.h>
+#include <system.hxx>
bool safeWrite(int fd, void* data, sal_uInt32 dataSize)
{
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
index 3e67de7..d569d1d 100644
--- a/sal/osl/unx/security.cxx
+++ b/sal/osl/unx/security.cxx
@@ -28,7 +28,7 @@
#include <postmac.h>
#endif
-#include "system.h"
+#include "system.hxx"
#include <osl/security.h>
#include <osl/diagnose.h>
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 75d3329..890b73e 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -22,7 +22,7 @@
#include <config_features.h>
/* system headers */
-#include "system.h"
+#include "system.hxx"
#if defined( MACOSX )
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 4e65858..f9836af 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "system.h"
+#include "system.hxx"
#include <osl/socket.h>
#include <osl/diagnose.h>
diff --git a/sal/osl/unx/system.cxx b/sal/osl/unx/system.cxx
index cb5734d..6fae151 100644
--- a/sal/osl/unx/system.cxx
+++ b/sal/osl/unx/system.cxx
@@ -22,7 +22,7 @@
#include <config_features.h>
-#include "system.h"
+#include "system.hxx"
#ifdef NO_PTHREAD_RTL
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.hxx
similarity index 98%
rename from sal/osl/unx/system.h
rename to sal/osl/unx/system.hxx
index b3162f1..3013e91 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SAL_OSL_UNX_SYSTEM_H
-#define INCLUDED_SAL_OSL_UNX_SYSTEM_H
+#ifndef INCLUDED_SAL_OSL_UNX_SYSTEM_HXX
+#define INCLUDED_SAL_OSL_UNX_SYSTEM_HXX
#include <stdio.h>
#include <stdlib.h>
@@ -246,13 +246,7 @@
# define NO_PTHREAD_RTL
/* for NSGetArgc/Argv/Environ */
# include <crt_externs.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
int macxp_resolveAlias(char *path, int buflen);
-#ifdef __cplusplus
-}
-#endif
#endif
#ifdef IOS
diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx
index 204535c..38cc0b8 100644
--- a/sal/osl/unx/tempfile.cxx
+++ b/sal/osl/unx/tempfile.cxx
@@ -22,7 +22,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
-#include "system.h"
+#include "system.hxx"
#include <osl/file.h>
#include <osl/thread.h>
#include <rtl/ustrbuf.h>
diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index f681175..78843ea 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include <cassert>
-#include "system.h"
+#include "system.hxx"
#include <string.h>
#if defined(OPENBSD)
#include <sched.h>
diff --git a/sal/osl/unx/time.cxx b/sal/osl/unx/time.cxx
index aba39d5..1fbd2fb 100644
--- a/sal/osl/unx/time.cxx
+++ b/sal/osl/unx/time.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include "saltime.hxx"
-#include "system.h"
+#include "system.hxx"
#include <osl/diagnose.h>
#include <osl/time.h>
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index c28491c..a984816 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -20,7 +20,7 @@
#include <config_features.h>
#include "uunxapi.hxx"
-#include "system.h"
+#include "system.hxx"
#include <limits.h>
#include <rtl/ustring.hxx>
#include <osl/thread.h>
More information about the Libreoffice-commits
mailing list