blob: 3ce115c46d94e2b8cb053be1e9ccb02fe98af548 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
--- vcl/unx/inc/xfont.hxx~ 2011-01-18 22:35:50.000000000 +0900
+++ vcl/unx/inc/xfont.hxx 2011-11-06 07:38:40.000000000 +0900
@@ -27,7 +27,7 @@
#ifndef EXTENDED_FONTSTRUCT_HXX
#define EXTENDED_FONTSTRUCT_HXX
-#ifndef _XLIB_H_
+#ifndef _X11_XLIB_H_
#include <tools/prex.h>
#include <X11/Xlib.h>
#include <tools/postx.h>
--- vcl/unx/inc/dtint.hxx~ 2011-01-18 22:35:50.000000000 +0900
+++ vcl/unx/inc/dtint.hxx 2011-11-06 07:38:23.000000000 +0900
@@ -36,7 +36,7 @@
class SalDisplay;
class AllSettings;
-#ifndef _XLIB_H_
+#ifndef _X11_XLIB_H_
// forwards from X
struct Display;
struct XEvent;
|
