diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 17:12:03 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 17:12:03 +0100 |
commit | af66914c1151533ced12bca6e8a7ec14348bdb9e (patch) | |
tree | 0e43952879f84ee646deaeecedc70d0866965c22 /sal | |
parent | 26cf7dcf19933feffabcb6b690e840c51f04c31b (diff) |
system.h -> system.hxx
Change-Id: I39a60d0b775bfe40fa89e8b5d5f7466d0db5d36e
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/unx/conditn.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/file.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/file_misc.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/file_stat.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/file_url.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/file_volume.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/interlck.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/module.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/mutex.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/nlsupport.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/pipe.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/process.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/profile.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/readwrite_helper.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/security.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/signal.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/socket.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/system.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/system.hxx (renamed from sal/osl/unx/system.h) | 10 | ||||
-rw-r--r-- | sal/osl/unx/tempfile.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/thread.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/time.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/uunxapi.cxx | 2 |
23 files changed, 24 insertions, 30 deletions
diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx index 36fd44abd346..1ba0f842dfbc 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 a8b004bec863..659526bcd6ea 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 658e0a66c0bf..44095fab9119 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 c589e4049461..ab61199f212b 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 1ce642453806..30c03ba2eebc 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 c530eb007ee9..f99092d815a7 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 025d8dcbe7a5..01e8da4ebbaf 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 cb0e76372d4e..e8ae7b59d418 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 62f212f15a93..5898622c0754 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 a7e764059936..93cc85976994 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 12e9b6a8d03e..b1b5a7649ef5 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 537b1eb73850..7355ac97a57d 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 a47bdbc0f3bf..6c54f6aa02a5 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 949712862f2b..68caa176690d 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 3e67de7f27d5..d569d1dd8640 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 75d3329fcb22..890b73e523c9 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 4e65858f7485..f9836af376b8 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 cb5734dc9d44..6fae151cb2f4 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 index b3162f17dcde..3013e91c6341 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 204535c455aa..38cc0b83502f 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 f681175081bc..78843eae09a7 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 aba39d525b79..1fbd2fb2fe9a 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 c28491ce519b..a98481622c4c 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> |