diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
| commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
| tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/ImUtil.h | |
| parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
| parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
| download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip | |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/ImUtil.h')
| -rw-r--r-- | nx-X11/lib/X11/ImUtil.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/lib/X11/ImUtil.h b/nx-X11/lib/X11/ImUtil.h index 5b62571ac..a8b95eead 100644 --- a/nx-X11/lib/X11/ImUtil.h +++ b/nx-X11/lib/X11/ImUtil.h @@ -1,5 +1,6 @@ -#ifndef _IMUTIL_H_ +#if !defined(_X11_IMUTIL_H_) && !defined(_IM_UTIL_H_) +#define _X11_IMUTIL_H_ #define _IMUTIL_H_ extern int @@ -27,4 +28,4 @@ extern void _XInitImageFuncPtrs( register XImage *image); -#endif /* _IMUTIL_H_ */ +#endif /* !defined(_X11_IMUTIL_H_) && !defined(_IM_UTIL_H_) */ |