diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-19 22:15:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-19 22:15:01 +0200 |
| commit | 70ac75f4ab184c21d11b9840a47362610aaef481 (patch) | |
| tree | 183b9ec7e6897fb2cea7296b461a35ca93dfce6e /nx-X11/include/extensions | |
| parent | 6c303d9e4ffd162b8c7f59a4b135e592d923a656 (diff) | |
| parent | 70e9d346fe34af127d2c827c3678e53d0f4312ae (diff) | |
| download | nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.gz nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.bz2 nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.zip | |
Merge branch 'uli42-pr/libX11_further_backports' into 3.6.x
Attributes GH PR #222: https://github.com/ArcticaProject/nx-libs/pull/222
Diffstat (limited to 'nx-X11/include/extensions')
| -rw-r--r-- | nx-X11/include/extensions/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/include/extensions/xf86bigfproto.h (renamed from nx-X11/include/extensions/xf86bigfstr.h) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index d2be4b324..2d8f63494 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -13,7 +13,7 @@ SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h #endif #if BuildXF86BigfontExt -XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfstr.h +XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfproto.h #endif #if BuildXvExt XVHEADERS = Xv.h Xvlib.h Xvproto.h diff --git a/nx-X11/include/extensions/xf86bigfstr.h b/nx-X11/include/extensions/xf86bigfproto.h index 4a8eda47a..b4b791fb9 100644 --- a/nx-X11/include/extensions/xf86bigfstr.h +++ b/nx-X11/include/extensions/xf86bigfproto.h @@ -7,8 +7,8 @@ /* THIS IS NOT AN X CONSORTIUM STANDARD */ -#ifndef _XF86BIGFSTR_H_ -#define _XF86BIGFSTR_H_ +#ifndef _XF86BIGFPROTO_H_ +#define _XF86BIGFPROTO_H_ #include <nx-X11/extensions/xf86bigfont.h> @@ -85,4 +85,4 @@ typedef struct { /* Bit masks that can be set in the flags */ #define XF86Bigfont_FLAGS_Shm 1 -#endif /* _XF86BIGFSTR_H_ */ +#endif /* _XF86BIGFPROTO_H_ */ |