summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-19 12:36:59 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-19 13:01:36 +0100
commit8480c1830f30a7986c9b693de385245173355fae (patch)
tree2c881dcb6609f1bad3bffd22855c4232e066272a /sal
parente46712f4e87fc4f0fa5b1b7eed6a8a103a458af4 (diff)
file_error_transl.h -> file_error_transl.hxx
Change-Id: Ia71097a3d0fbeb606b1f6cfb7e6edb86bd45082a
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/file.cxx2
-rw-r--r--sal/osl/unx/file_error_transl.cxx6
-rw-r--r--sal/osl/unx/file_error_transl.hxx (renamed from sal/osl/unx/file_error_transl.h)19
-rw-r--r--sal/osl/unx/file_misc.cxx2
-rw-r--r--sal/osl/unx/file_stat.cxx2
-rw-r--r--sal/osl/unx/file_url.cxx2
-rw-r--r--sal/osl/unx/file_volume.cxx2
7 files changed, 13 insertions, 22 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index b592151fa67f..e7030365758c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -32,7 +32,7 @@
#include "system.h"
#include "createfilehandlefromfd.hxx"
-#include "file_error_transl.h"
+#include "file_error_transl.hxx"
#include "file_impl.hxx"
#include "file_url.h"
#include "uunxapi.h"
diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx
index 42077466fe9e..bdeed9bc60c3 100644
--- a/sal/osl/unx/file_error_transl.cxx
+++ b/sal/osl/unx/file_error_transl.cxx
@@ -18,16 +18,16 @@
*/
#include <errno.h>
-#include "file_error_transl.h"
+#include "file_error_transl.hxx"
#include <osl/diagnose.h>
-oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
+oslFileError oslTranslateFileError(bool bIsError, int Errno)
{
oslFileError osl_error = osl_File_E_invalidError;
OSL_ENSURE((bIsError && (0 != Errno)) || (!bIsError && (0 == Errno)), "oslTranslateFileError strange input combination!");
- /* Have a look at file_error_transl.h for
+ /* Have a look at file_error_transl.hxx for
the reason that we do this here */
if (bIsError && (0 == Errno))
return osl_error;
diff --git a/sal/osl/unx/file_error_transl.h b/sal/osl/unx/file_error_transl.hxx
index 2548dea042a2..33f282b8ae97 100644
--- a/sal/osl/unx/file_error_transl.h
+++ b/sal/osl/unx/file_error_transl.hxx
@@ -17,17 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_H
-#define INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_H
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_HXX
+#define INCLUDED_SAL_OSL_UNX_FILE_ERROR_TRANSL_HXX
#include <osl/file.h>
#include <sal/types.h>
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
/*********************************************
oslTranslateFileError
Translate errno's to osl file errors
@@ -49,14 +44,10 @@ extern "C"
*********************************************/
-#define OSL_FET_SUCCESS sal_False
-#define OSL_FET_ERROR sal_True
+#define OSL_FET_SUCCESS false
+#define OSL_FET_ERROR true
-oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno);
-
-#ifdef __cplusplus
-}
-#endif
+oslFileError oslTranslateFileError(bool bIsError, int Errno);
#endif
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 7873783753e3..300514c25ec7 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -28,7 +28,7 @@
#include "system.h"
#include "file_impl.hxx"
-#include "file_error_transl.h"
+#include "file_error_transl.hxx"
#include "file_path_helper.hxx"
#include "file_url.h"
#include "uunxapi.hxx"
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index e35a50dfbec5..bf2e92e883c6 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -29,7 +29,7 @@
#include <osl/diagnose.h>
#include "file_impl.hxx"
-#include "file_error_transl.h"
+#include "file_error_transl.hxx"
#include "file_path_helper.hxx"
#include "file_url.h"
#include "uunxapi.hxx"
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index dc3bf8eba396..1832fd6d6ffb 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -37,7 +37,7 @@
#include <rtl/ustrbuf.h>
#include "rtl/textcvt.h"
-#include "file_error_transl.h"
+#include "file_error_transl.hxx"
#include "file_path_helper.hxx"
#include "uunxapi.hxx"
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index c200217339b9..ee225d2d1034 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -23,7 +23,7 @@
#include "osl/thread.h"
#include "rtl/alloc.h"
-#include "file_error_transl.h"
+#include "file_error_transl.hxx"
#include "file_url.h"
#include "system.h"