diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-26 10:18:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-27 09:36:53 +0100 |
| commit | aa753f01ba4631614bb88ee7d3a3e6b222208b3e (patch) | |
| tree | c8b168e8e0619c387d30f206848ec30ca7238a00 /extensions/source/nsplugin | |
| parent | 2ea2860ba56231d989c5e1b8f87392921bc2a8db (diff) | |
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
Diffstat (limited to 'extensions/source/nsplugin')
| -rw-r--r-- | extensions/source/nsplugin/source/npshell.cxx | 3 | ||||
| -rw-r--r-- | extensions/source/nsplugin/source/so_env.cxx | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index b1d3e199a975..dc0737806916 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -123,10 +123,11 @@ long int NSP_WriteToPipe(NSP_PIPE_FD fp, void* buf, unsigned long int len) static pid_t nChildPID = 0; #endif +#if defined WNT + #define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1) #define MY_STRING(s) (s), MY_LENGTH(s) -#if defined WNT namespace { bool extendEnvironment(boost::scoped_array< WCHAR > * environment) { diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index 9dac2488fcb6..447102ac1d8b 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include "sal/config.h" + +#include "nsp_func.hxx" #ifdef UNIX #include <sys/types.h> @@ -34,9 +37,6 @@ #include <dlfcn.h> #endif #include <stdarg.h> -// For vsnprintf() -#define NSP_vsnprintf vsnprintf -#include "nsp_func.hxx" #endif // End UNIX #ifdef WNT @@ -53,8 +53,6 @@ #include <stdlib.h> #include <shlobj.h> #include <objidl.h> -// For vsnprintf() -#define NSP_vsnprintf _vsnprintf #ifdef _MSC_VER #pragma warning (pop) |