[Libreoffice-commits] .: Branch 'libreoffice-3-3' - vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Nov 4 10:16:39 PDT 2010
vcl/unx/inc/dtint.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5e304209b6c0ca3b9a4aab6181d3c832055811ef
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 4 14:44:14 2010 +0000
latest libX11 changed header guards
(cherry picked from commit cd10b146b67f7329f699e48e74d2961dbcceb123)
diff --git a/vcl/unx/inc/dtint.hxx b/vcl/unx/inc/dtint.hxx
index 724dad6..b173830 100644
--- a/vcl/unx/inc/dtint.hxx
+++ b/vcl/unx/inc/dtint.hxx
@@ -37,7 +37,7 @@ class SalBitmap;
class SalDisplay;
class AllSettings;
-#ifndef _XLIB_H_
+#if !defined(_XLIB_H_) && !defined(_X11_XLIB_H_)
// forwards from X
struct Display;
struct XEvent;
More information about the Libreoffice-commits
mailing list