diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-25 19:56:20 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-25 19:58:16 +0100 |
commit | 488e6875e992e11601611a119476624822fc4635 (patch) | |
tree | b70124749e69faf507d0e317ca9d7e26753e99a2 /sal/qa | |
parent | 909de9de9fce6a2e8a5c4e859038d00ce3e88c15 (diff) |
remove external include guards
Change-Id: If5758e02baa8e019923355b6c97043b306223fdd
Diffstat (limited to 'sal/qa')
-rw-r--r-- | sal/qa/OStringBuffer/rtl_String_Const.h | 19 | ||||
-rw-r--r-- | sal/qa/OStringBuffer/rtl_String_Utils.hxx | 14 | ||||
-rw-r--r-- | sal/qa/OStringBuffer/rtl_String_Utils_Const.h | 4 | ||||
-rw-r--r-- | sal/qa/osl/condition/osl_Condition_Const.h | 6 | ||||
-rw-r--r-- | sal/qa/osl/mutex/osl_Mutex_Const.h | 6 | ||||
-rw-r--r-- | sal/qa/osl/socket/osl_Socket_Const.h | 12 | ||||
-rw-r--r-- | sal/qa/osl/socket/osl_Socket_Const_orig.h | 12 | ||||
-rw-r--r-- | sal/qa/rtl_strings/rtl_String_Const.h | 18 | ||||
-rw-r--r-- | sal/qa/rtl_strings/rtl_String_Utils.hxx | 14 | ||||
-rw-r--r-- | sal/qa/rtl_strings/rtl_String_Utils_Const.h | 4 |
10 files changed, 16 insertions, 93 deletions
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h index 62248d58e219..d07d7e92f3ee 100644 --- a/sal/qa/OStringBuffer/rtl_String_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Const.h @@ -20,23 +20,12 @@ #ifndef _RTL_STRING_CONST_H_ #define _RTL_STRING_CONST_H_ -#ifndef _RTL_STRING_UTILS_HXX_ - #include <rtl_String_Utils.hxx> -#endif +#include <rtl_String_Utils.hxx> #include <limits.h> - -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif - -#ifndef _RTL_TEXTENC_H - #include <rtl/textenc.h> -#endif - -#ifndef _RTL_USTRING_H_ - #include <rtl/ustring.h> -#endif +#include <sal/types.h> +#include <rtl/textenc.h> +#include <rtl/ustring.h> #ifdef __cplusplus extern "C" diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx index f0501cbc1f49..a824ef9f5270 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx @@ -25,17 +25,9 @@ #include <math.h> #include <stdlib.h> -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif - -#ifndef _RTL_USTRING_H_ - #include <rtl/ustring.h> -#endif - -#ifndef _RTL_STRING_HXX_ - #include <rtl/string.hxx> -#endif +#include <sal/types.h> +#include <rtl/ustring.h> +#include <rtl/string.hxx> sal_Char* cpystr( sal_Char* dst, const sal_Char* src ); sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h index 8e8d9453cafd..e855199455b9 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h @@ -20,9 +20,7 @@ #ifndef _RTL_STRING_UTILS_CONST_H_ #define _RTL_STRING_UTILS_CONST_H_ -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif +#include <sal/types.h> #ifdef __cplusplus extern "C" diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index 6101914fa9a6..04b6d1390091 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -22,16 +22,10 @@ #include <sal/types.h> #include <rtl/ustring.hxx> - -#ifndef _OSL_THREAD_HXX_ #include <osl/thread.hxx> -#endif #include <osl/mutex.hxx> #include <osl/pipe.hxx> - -#ifndef _OSL_CONDITION_HXX_ #include <osl/conditn.hxx> -#endif #include <osl/time.h> #ifdef UNX diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h index 717431fc4fd1..133f1f02e231 100644 --- a/sal/qa/osl/mutex/osl_Mutex_Const.h +++ b/sal/qa/osl/mutex/osl_Mutex_Const.h @@ -22,14 +22,8 @@ #include <sal/types.h> #include <rtl/ustring.hxx> - -#ifndef _OSL_THREAD_HXX #include <osl/thread.hxx> -#endif - -#ifndef _OSL_MUTEX_HXX #include <osl/mutex.hxx> -#endif #include <osl/time.h> #ifdef UNX diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index 88ac501d4e3e..c992fe7fc1a6 100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -24,23 +24,11 @@ #include <rtl/textenc.h> #include <rtl/ustring.hxx> #include <rtl/ustring.h> - -#ifndef _OSL_SOCLET_HXX_ #include <osl/socket.hxx> -#endif #include <osl/socket.h> - -#ifndef _OSL_THREAD_HXX #include <osl/thread.hxx> -#endif - -#ifndef _OSL_FILE_HXX #include <osl/file.hxx> -#endif - -#ifndef _OSL_MUTEX_HXX #include <osl/mutex.hxx> -#endif #include <osl/time.h> const char * pTestString1 = "test socket"; diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h index c3d87c142b4b..ce63ed8fd603 100644 --- a/sal/qa/osl/socket/osl_Socket_Const_orig.h +++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h @@ -24,23 +24,11 @@ #include <rtl/textenc.h> #include <rtl/ustring.hxx> #include <rtl/ustring.h> - -#ifndef _OSL_SOCLET_HXX_ #include <osl/socket.hxx> -#endif #include <osl/socket.h> - -#ifndef _OSL_THREAD_HXX #include <osl/thread.hxx> -#endif - -#ifndef _OSL_FILE_HXX #include <osl/file.hxx> -#endif - -#ifndef _OSL_MUTEX_HXX #include <osl/mutex.hxx> -#endif #include <osl/time.h> const char * pTestString1 = "test socket"; diff --git a/sal/qa/rtl_strings/rtl_String_Const.h b/sal/qa/rtl_strings/rtl_String_Const.h index e66a063a371f..bc1fbe8c7545 100644 --- a/sal/qa/rtl_strings/rtl_String_Const.h +++ b/sal/qa/rtl_strings/rtl_String_Const.h @@ -20,23 +20,13 @@ #ifndef _RTL_STRING_CONST_H_ #define _RTL_STRING_CONST_H_ -#ifndef _RTL_STRING_UTILS_HXX_ - #include <rtl_String_Utils.hxx> -#endif +#include <rtl_String_Utils.hxx> #include <limits.h> -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif - -#ifndef _RTL_TEXTENC_H - #include <rtl/textenc.h> -#endif - -#ifndef _RTL_USTRING_H_ - #include <rtl/ustring.h> -#endif +#include <sal/types.h> +#include <rtl/textenc.h> +#include <rtl/ustring.h> #ifdef __cplusplus extern "C" diff --git a/sal/qa/rtl_strings/rtl_String_Utils.hxx b/sal/qa/rtl_strings/rtl_String_Utils.hxx index ca498af8b608..811386f3966c 100644 --- a/sal/qa/rtl_strings/rtl_String_Utils.hxx +++ b/sal/qa/rtl_strings/rtl_String_Utils.hxx @@ -25,17 +25,9 @@ #include <math.h> #include <stdlib.h> -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif - -#ifndef _RTL_USTRING_H_ - #include <rtl/ustring.h> -#endif - -#ifndef _RTL_STRING_HXX_ - #include <rtl/string.hxx> -#endif +#include <sal/types.h> +#include <rtl/ustring.h> +#include <rtl/string.hxx> sal_Char* cpystr( sal_Char* dst, const sal_Char* src ); sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); diff --git a/sal/qa/rtl_strings/rtl_String_Utils_Const.h b/sal/qa/rtl_strings/rtl_String_Utils_Const.h index 8e8d9453cafd..e855199455b9 100644 --- a/sal/qa/rtl_strings/rtl_String_Utils_Const.h +++ b/sal/qa/rtl_strings/rtl_String_Utils_Const.h @@ -20,9 +20,7 @@ #ifndef _RTL_STRING_UTILS_CONST_H_ #define _RTL_STRING_UTILS_CONST_H_ -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif +#include <sal/types.h> #ifdef __cplusplus extern "C" |