aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-10-07 21:00:20 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-19 21:40:27 +0200
commit1078f97706b77ab93fb30204acf270cfb652c900 (patch)
treeb92d21acf64c8b45312621c895458c2db30135ca
parente03d8c215ea51164b4c53a821e0a77660b60ffbd (diff)
downloadnx-libs-1078f97706b77ab93fb30204acf270cfb652c900.tar.gz
nx-libs-1078f97706b77ab93fb30204acf270cfb652c900.tar.bz2
nx-libs-1078f97706b77ab93fb30204acf270cfb652c900.zip
rename xf86bigfstr.h to xf86bigfproto.h
-rw-r--r--debian/copyright.in2
-rwxr-xr-xdebian/rules2
-rw-r--r--nx-X11/include/extensions/Imakefile2
-rw-r--r--nx-X11/include/extensions/xf86bigfproto.h (renamed from nx-X11/include/extensions/xf86bigfstr.h)6
-rw-r--r--nx-X11/lib/X11/Font.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xf86bigfont.c2
-rw-r--r--nx-X11/programs/Xserver/mi/miinitext.c2
-rw-r--r--nx-libs.spec2
8 files changed, 10 insertions, 10 deletions
diff --git a/debian/copyright.in b/debian/copyright.in
index 8d6f30208..7e11780ea 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -3446,7 +3446,7 @@ License: Expat
FIXME
Files: nx-X11/include/extensions/xf86bigfont.h
- nx-X11/include/extensions/xf86bigfstr.h
+ nx-X11/include/extensions/xf86bigfproto.h
nx-X11/programs/Xserver/Xext/xf86bigfont.c
Copyright: 1999-2000, Bruno Haible
1999-2000, The XFree86 Project, Inc
diff --git a/debian/rules b/debian/rules
index 047839c2f..5f8ba75ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ override_dh_install:
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/bigreqstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xcmiscstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XIproto.h
- rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfstr.h
+ rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfproto.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/xf86bigfont.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/XI.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx-X11/extensions/dpms.h
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_ */
diff --git a/nx-X11/lib/X11/Font.c b/nx-X11/lib/X11/Font.c
index 7943ba7a1..298d96c63 100644
--- a/nx-X11/lib/X11/Font.c
+++ b/nx-X11/lib/X11/Font.c
@@ -45,7 +45,7 @@ authorization from the X Consortium and the XFree86 Project.
#include <stdio.h>
#include <stdlib.h>
-#include <nx-X11/extensions/xf86bigfstr.h>
+#include <nx-X11/extensions/xf86bigfproto.h>
#endif
#include "Xlcint.h"
diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
index 253706ad2..67a09f77b 100644
--- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c
+++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c
@@ -74,7 +74,7 @@
#include "protocol-versions.h"
#define _XF86BIGFONT_SERVER_
-#include <nx-X11/extensions/xf86bigfstr.h>
+#include <nx-X11/extensions/xf86bigfproto.h>
static void XF86BigfontResetProc(
ExtensionEntry * /* extEntry */
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index 22f48ffd8..b48ed8a1c 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -172,7 +172,7 @@ typedef void (*InitExtension)(void);
#include <nx-X11/extensions/panoramiXproto.h>
#endif
#ifdef XF86BIGFONT
-#include <nx-X11/extensions/xf86bigfstr.h>
+#include <nx-X11/extensions/xf86bigfproto.h>
#endif
#ifdef RES
#include <nx-X11/extensions/XResproto.h>
diff --git a/nx-libs.spec b/nx-libs.spec
index 47ac2aa52..6ba05c5ee 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -562,7 +562,7 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%{_includedir}/nx-X11/extensions/syncstr.h
%{_includedir}/nx-X11/extensions/xcmiscstr.h
%{_includedir}/nx-X11/extensions/xf86bigfont.h
-%{_includedir}/nx-X11/extensions/xf86bigfstr.h
+%{_includedir}/nx-X11/extensions/xf86bigfproto.h
%{_includedir}/nx-X11/extensions/xfixesproto.h
%{_includedir}/nx-X11/extensions/xfixeswire.h
%{_includedir}/nx-X11/extensions/xtestconst.h