mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
4ac97e16b6
Not tested. svn path=/nixpkgs/branches/x-updates/; revision=25983
23 lines
603 B
Diff
23 lines
603 B
Diff
https://bugs.freedesktop.org/show_bug.cgi?id=31322
|
|
|
|
diff -rc OOO320_m19-orig//vcl/unx/inc/dtint.hxx OOO320_m19//vcl/unx/inc/dtint.hxx
|
|
*** OOO320_m19-orig//vcl/unx/inc/dtint.hxx 2010-05-26 20:34:28.000000000 +0200
|
|
--- OOO320_m19//vcl/unx/inc/dtint.hxx 2011-02-15 17:04:32.134813676 +0100
|
|
***************
|
|
*** 36,42 ****
|
|
class SalDisplay;
|
|
class AllSettings;
|
|
|
|
! #ifndef _XLIB_H_
|
|
// forwards from X
|
|
struct Display;
|
|
struct XEvent;
|
|
--- 36,42 ----
|
|
class SalDisplay;
|
|
class AllSettings;
|
|
|
|
! #if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
|
|
// forwards from X
|
|
struct Display;
|
|
struct XEvent;
|