diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-02-15 12:12:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-02-15 15:52:04 +0000 |
| commit | c787fcbf1e698bbb15bed9997a8b58382b5857d0 (patch) | |
| tree | 3a7414faabecdffdcab934a336dc7d92ae401a34 /vcl | |
| parent | 659279c8def8141e6f6da4d580dfb0c7624affa4 (diff) | |
dragonfly stuff
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/inc/saldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/inc/salunx.h | 2 | ||||
| -rw-r--r-- | vcl/unx/source/app/i18n_ic.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 6 | ||||
| -rwxr-xr-x | vcl/util/makefile.mk | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index e27a9974c872..233f97447693 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -48,7 +48,7 @@ class SalPrinter; DECLARE_LIST( SalDisplays, SalDisplay* ) #if defined SCO || defined LINUX || defined NETBSD || defined AIX || \ - defined HPUX || defined FREEBSD || defined OPENBSD + defined HPUX || defined FREEBSD || defined OPENBSD || defined DRAGONFLY #include <pthread.h> #else typedef unsigned int pthread_t; diff --git a/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h index 9956537a8b80..3aa69261a2d4 100644 --- a/vcl/unx/inc/salunx.h +++ b/vcl/unx/inc/salunx.h @@ -31,7 +31,7 @@ // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #if defined SCO || defined LINUX || defined HPUX || defined FREEBSD || \ - defined NETBSD || defined OPENBSD + defined NETBSD || defined OPENBSD || defined DRAGONFLY #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 7bbfe2b8f904..fc43e7b81d0b 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 || defined OPENBSD +#if defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY 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 || defined OPENBSD +#if defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY if ( mpStatusAttributes != NULL ) #endif mpAttributes = XVaAddToNestedList( mpAttributes, diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index 3ee7bae21505..13bc7fc180de 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -893,7 +893,8 @@ void SalDisplay::Init() sscanf( pProperties, "%li", &nProperties_ ); else { -#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD +#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || \ + defined NETBSD || defined OPENBSD || defined DRAGONFLY nProperties_ |= PROPERTY_FEATURE_Maximize; #endif // Server Bugs & Properties @@ -919,7 +920,8 @@ void SalDisplay::Init() if( GetServerVendor() == vendor_xfree ) { nProperties_ |= PROPERTY_BUG_XCopyArea_GXxor; -#if defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD +#if defined LINUX || defined FREEBSD || defined NETBSD || defined OPENBSD || \ + defined DRAGONFLY // 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/util/makefile.mk b/vcl/util/makefile.mk index 20be25d53a62..7f80738c61a1 100755 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -328,7 +328,7 @@ SHL2STDLIBS+=`pkg-config --libs xrender` SHL2STDLIBS += -lXext -lSM -lICE -lX11 .IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && \ - && "$(OS)"!="OPENBSD" + && "$(OS)"!="OPENBSD" "$(OS)"!="DRAGONFLY" # needed by salprnpsp.cxx SHL2STDLIBS+= -ldl .ENDIF |