summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-26 10:18:14 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-03-27 09:36:53 +0100
commitaa753f01ba4631614bb88ee7d3a3e6b222208b3e (patch)
treec8b168e8e0619c387d30f206848ec30ca7238a00 /sal
parent2ea2860ba56231d989c5e1b8f87392921bc2a8db (diff)
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/diagnose.cxx7
-rw-r--r--sal/osl/unx/file.cxx2
-rw-r--r--sal/osl/unx/pipe.c1
-rw-r--r--sal/osl/unx/profile.c21
-rw-r--r--sal/osl/unx/socket.c9
5 files changed, 0 insertions, 40 deletions
diff --git a/sal/osl/unx/diagnose.cxx b/sal/osl/unx/diagnose.cxx
index b712576daf2e..99cb9e94e639 100644
--- a/sal/osl/unx/diagnose.cxx
+++ b/sal/osl/unx/diagnose.cxx
@@ -38,15 +38,8 @@
#endif /* HAVE_DLFCN_H */
-#ifndef INCLUDED_PTHREAD_H
#include <pthread.h>
-#define INCLUDED_PTHREAD_H
-#endif
-
-#ifndef INCLUDED_STDDEF_H
#include <stddef.h>
-#define INCLUDED_STDDEF_H
-#endif
/************************************************************************/
/* Internal data structures and functions */
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 008c61e67f2c..c6f55dc16c02 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -55,10 +55,8 @@
#ifdef DEBUG_OSL_FILE
# define OSL_FILE_TRACE osl_trace
-# define PERROR( a, b ) perror( a ); fprintf( stderr, b )
#else
# define OSL_FILE_TRACE(fmt, ...)
-# define PERROR( a, b )
#endif
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index f0720ec3fa80..f0f91da98edc 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -94,7 +94,6 @@ static oslPipeError osl_PipeErrorFromNative(int nativeType)
/* macros */
-#define ERROR_TO_NATIVE(x) osl_NativeFromPipeError(x)
#define ERROR_FROM_NATIVE(y) osl_PipeErrorFromNative(y)
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index 4af99904c43d..d27dda765463 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -35,13 +35,6 @@
#define ENTRIES_INI 5
#define ENTRIES_ADD 3
-
-#define STR_INI_EXTENSION "rc"
-#define STR_INI_METAHOME "?~"
-#define STR_INI_METASYS "?$"
-#define STR_INI_METACFG "?^"
-#define STR_INI_METAINS "?#"
-
#define STR_INI_BOOLYES "yes"
#define STR_INI_BOOLON "on"
#define STR_INI_BOOLONE "1"
@@ -53,22 +46,8 @@
#define FLG_AUTOOPEN 0x0100
#define FLG_MODIFIED 0x0200
-#define SVERSION_LOCATION STR_INI_METACFG
-#define SVERSION_FALLBACK STR_INI_METASYS
-#define SVERSION_NAME "sversion"
-#define SVERSION_SECTION "Versions"
-#define SVERSION_SOFFICE "StarOffice"
-#define SVERSION_PROFILE "sofficerc"
-#define SVERSION_OPTION "userid:"
-#define SVERSION_DIRS { "bin", "program" }
-#define SVERSION_USER "user"
-
#define DEFAULT_PMODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
-#define _BUILD_STR_(n) # n
-#define BUILD_STR(n) _BUILD_STR_(n)
-
-
/*#define DEBUG_OSL_PROFILE*/
/*#define TRACE_OSL_PROFILE*/
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index a9f3fc07192f..3ed3dc86f212 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -153,7 +153,6 @@ static oslProtocol osl_ProtocolFromNative(sal_uInt32 nativeType)
*/
/* macros */
-#define PROTOCOL_FROM_NATIVE(y) osl_ProtocolFromNative(y)
#define PROTOCOL_TO_NATIVE(x) ProtocolMap[x]
@@ -236,8 +235,6 @@ static oslSocketOption osl_SocketOptionFromNative(sal_uInt32 nativeType)
*/
/* macros */
#define OPTION_TO_NATIVE(x) OptionMap[x]
-#define OPTION_FROM_NATIVE(y) osl_SocketOptionFromNative(y)
-
/*****************************************************************************/
/* enum oslSocketOptionLevel */
@@ -267,7 +264,6 @@ static oslSocketOptionLevel osl_SocketOptionLevelFromNative(sal_uInt32 nativeTyp
*/
/* macros */
#define OPTION_LEVEL_TO_NATIVE(x) OptionLevelMap[x]
-#define OPTION_LEVEL_FROM_NATIVE(y) osl_SocketOptionLevelFromNative(y)
/*****************************************************************************/
/* enum oslSocketMsgFlag */
@@ -301,8 +297,6 @@ static oslSocketMsgFlag osl_SocketMsgFlagFromNative(sal_uInt32 nativeType)
/* macros */
#define MSG_FLAG_TO_NATIVE(x) SocketMsgFlagMap[x]
-#define MSG_FLAG_FROM_NATIVE(y) osl_SocketMsgFlagFromNative(y)
-
/*****************************************************************************/
/* enum oslSocketDirection */
@@ -334,7 +328,6 @@ static oslSocketDirection osl_SocketDirectionFromNative(sal_uInt32 nativeType)
/* macros */
#define DIRECTION_TO_NATIVE(x) SocketDirection[x]
-#define DIRECTION_FROM_NATIVE(y) osl_SocketDirectionFromNative(y)
/*****************************************************************************/
/* enum oslSocketError */
@@ -406,7 +399,6 @@ static oslSocketError osl_SocketErrorFromNative(int nativeType)
}
/* macros */
-#define ERROR_TO_NATIVE(x) osl_NativeFromSocketError(x)
#define ERROR_FROM_NATIVE(y) osl_SocketErrorFromNative(y)
/*****************************************************************************/
@@ -797,7 +789,6 @@ static struct hostent* _osl_gethostbyname_r (
static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName)
{
-# define DOMAINNAME_LENGTH 512
struct hostent aHostByName;
struct hostent *pHostByName;
sal_Char pQualifiedHostBuffer[ MAX_HOSTBUFFER_SIZE ];