diff options
author | Robert Nagy <robert@openbsd.org> | 2010-11-04 12:33:28 +0100 |
---|---|---|
committer | Robert Nagy <robert@openbsd.org> | 2010-11-08 12:30:02 +0100 |
commit | 48e6d1582a7752db2c8f9c8f4678466981ea8d2f (patch) | |
tree | 7a6d894207656d2244fe0ea7bcc5abe76c13ff2d /vcl | |
parent | ab3b7807ec2d95d7ddf43422b249fefd30240a05 (diff) |
Add OpenBSD ifdefs for vcl too
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/inc/saldata.hxx | 3 | ||||
-rw-r--r-- | vcl/unx/inc/salunx.h | 3 | ||||
-rw-r--r-- | vcl/unx/source/app/i18n_ic.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/source/dtrans/X11_selection.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/printer/printerinfomanager.cxx | 4 | ||||
-rw-r--r-- | vcl/util/makefile.mk | 3 |
7 files changed, 13 insertions, 10 deletions
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index b5d789b8521b..e27a9974c872 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -47,7 +47,8 @@ class SalPrinter; DECLARE_LIST( SalDisplays, SalDisplay* ) -#if defined SCO || defined LINUX || defined NETBSD || defined AIX || defined HPUX || defined FREEBSD +#if defined SCO || defined LINUX || defined NETBSD || defined AIX || \ + defined HPUX || defined FREEBSD || defined OPENBSD #include <pthread.h> #else typedef unsigned int pthread_t; diff --git a/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h index 89732db6c91d..9956537a8b80 100644 --- a/vcl/unx/inc/salunx.h +++ b/vcl/unx/inc/salunx.h @@ -30,7 +30,8 @@ #define _SALUNX_H // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#if defined SCO || defined LINUX || defined HPUX || defined FREEBSD || defined NETBSD +#if defined SCO || defined LINUX || defined HPUX || defined FREEBSD || \ + defined NETBSD || defined OPENBSD #include <sys/time.h> #elif defined AIX #include <time.h> diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx index 59fb02f1919a..48f6c53b5c5c 100644 --- a/vcl/unx/source/app/i18n_ic.cxx +++ b/vcl/unx/source/app/i18n_ic.cxx @@ -334,7 +334,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : if ( mnPreeditStyle != XIMPreeditNone ) { -#if defined LINUX || defined FREEBSD || defined NETBSD +#if defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD if ( mpPreeditAttributes != NULL ) #endif mpAttributes = XVaAddToNestedList( mpAttributes, @@ -342,7 +342,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : } if ( mnStatusStyle != XIMStatusNone ) { -#if defined LINUX || defined FREEBSD || defined NETBSD +#if defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD if ( mpStatusAttributes != NULL ) #endif mpAttributes = XVaAddToNestedList( mpAttributes, diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index 8a209d126a75..f2eecf0d9cbd 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -894,7 +894,7 @@ void SalDisplay::Init() sscanf( pProperties, "%li", &nProperties_ ); else { -#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD +#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || defined OPENBSD nProperties_ |= PROPERTY_FEATURE_Maximize; #endif // Server Bugs & Properties @@ -920,7 +920,7 @@ void SalDisplay::Init() if( GetServerVendor() == vendor_xfree ) { nProperties_ |= PROPERTY_BUG_XCopyArea_GXxor; -#if defined LINUX || defined FREEBSD +#if defined LINUX || defined FREEBSD || defined OPENBSD // otherwm and olwm are a kind of default, which are not detected // carefully. if we are running linux (i.e. not netbsd) on an xfree // display, fvwm is most probable the wm to choose, confusing with mwm diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx index 9d68974eced8..18d120d4961b 100644 --- a/vcl/unx/source/dtrans/X11_selection.cxx +++ b/vcl/unx/source/dtrans/X11_selection.cxx @@ -42,7 +42,7 @@ #include <X11/keysym.h> #include <X11/Xutil.h> #include "tools/postx.h" -#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) +#if defined(LINUX) || defined(NETBSD) || defined (FREEBSD) || defined(OPENBSD) #include <sys/poll.h> #else #include <poll.h> diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx index ecf3f78a49cb..0fff5b590b98 100644 --- a/vcl/unx/source/printer/printerinfomanager.cxx +++ b/vcl/unx/source/printer/printerinfomanager.cxx @@ -1207,7 +1207,7 @@ struct SystemCommandParameters tokenHandler pHandler; }; -#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD)) +#if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD)) static void lpgetSysQueueTokenHandler( const std::list< rtl::OString >& i_rLines, std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues, @@ -1352,7 +1352,7 @@ static void standardSysQueueTokenHandler( static const struct SystemCommandParameters aParms[] = { - #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) + #if defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) { "/usr/sbin/lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler }, { "lpc status", "lpr -P \"(PRINTER)\"", "", ":", 0, standardSysQueueTokenHandler }, { "LANG=C;LC_ALL=C;export LANG LC_ALL;lpstat -s", "lp -d \"(PRINTER)\"", "system for ", ": ", 1, standardSysQueueTokenHandler } diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index e8221e41ae3a..983530c58206 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -332,7 +332,8 @@ SHL2STDLIBS+=`pkg-config --libs xrender` .IF "$(GUIBASE)"=="unx" SHL2STDLIBS += -lXext -lSM -lICE -lX11 -.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" +.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && \ + && "$(OS)"!="OPENBSD" # needed by salprnpsp.cxx SHL2STDLIBS+= -ldl .ENDIF |