fontsproto-2.1.3
- videoproto-2.3.2 - xextproto-7.3.0 - xproto-7.0.26 - Cherry pick some unreleased fixes from upstream git
This commit is contained in:
Hans de Goede
parent
57077ff00b
commit
9adec9db76
4
.gitignore
vendored
4
.gitignore
vendored
@ -119,3 +119,7 @@ inputproto-2.0.1.tar.bz2
|
||||
/dri3proto-1.0.tar.bz2
|
||||
/xextproto-7.2.99.901.tar.bz2
|
||||
/glproto-1.4.17.tar.bz2
|
||||
/fontsproto-2.1.3.tar.bz2
|
||||
/videoproto-2.3.2.tar.bz2
|
||||
/xextproto-7.3.0.tar.bz2
|
||||
/xproto-7.0.26.tar.bz2
|
||||
|
||||
@ -1,139 +0,0 @@
|
||||
From 431a426623b2e46a0968d8fc631f36ec0cf7298f Mon Sep 17 00:00:00 2001
|
||||
From: Keith Packard <keithp@keithp.com>
|
||||
Date: Sun, 19 Jan 2014 12:59:45 -0800
|
||||
Subject: [PATCH] Replace 'pointer' with the equivalent 'void *'.
|
||||
|
||||
The pointer typedef is being removed because it causes so many
|
||||
compiler warnings when -Wshadow is enabled.
|
||||
|
||||
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
---
|
||||
fontproto.h | 2 +-
|
||||
fontstruct.h | 36 ++++++++++++++++++------------------
|
||||
2 files changed, 19 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/fontproto.h b/fontproto.h
|
||||
index 1ab8f37..490629e 100644
|
||||
--- a/fontproto.h
|
||||
+++ b/fontproto.h
|
||||
@@ -74,7 +74,7 @@ extern FontPtr CreateFontRec (void);
|
||||
extern void DestroyFontRec (FontPtr font);
|
||||
extern Bool _FontSetNewPrivate (FontPtr /* pFont */,
|
||||
int /* n */,
|
||||
- pointer /* ptr */);
|
||||
+ void * /* ptr */);
|
||||
extern int AllocateFontPrivateIndex (void);
|
||||
extern void ResetFontPrivateIndex (void);
|
||||
|
||||
diff --git a/fontstruct.h b/fontstruct.h
|
||||
index 97e771a..44bed90 100644
|
||||
--- a/fontstruct.h
|
||||
+++ b/fontstruct.h
|
||||
@@ -122,14 +122,14 @@ typedef struct _Font {
|
||||
void (*unload_font) (FontPtr /* font */);
|
||||
void (*unload_glyphs) (FontPtr /* font */);
|
||||
FontPathElementPtr fpe;
|
||||
- pointer svrPrivate;
|
||||
- pointer fontPrivate;
|
||||
- pointer fpePrivate;
|
||||
+ void *svrPrivate;
|
||||
+ void *fontPrivate;
|
||||
+ void *fpePrivate;
|
||||
int maxPrivate;
|
||||
- pointer *devPrivates;
|
||||
+ void **devPrivates;
|
||||
} FontRec;
|
||||
|
||||
-#define FontGetPrivate(pFont,n) ((n) > (pFont)->maxPrivate ? (pointer) 0 : \
|
||||
+#define FontGetPrivate(pFont,n) ((n) > (pFont)->maxPrivate ? (void *) 0 : \
|
||||
(pFont)->devPrivates[n])
|
||||
|
||||
#define FontSetPrivate(pFont,n,ptr) ((n) > (pFont)->maxPrivate ? \
|
||||
@@ -149,14 +149,14 @@ typedef struct _FontPathElement {
|
||||
char *name;
|
||||
int type;
|
||||
int refcount;
|
||||
- pointer private;
|
||||
+ void *private;
|
||||
} FontPathElementRec;
|
||||
|
||||
typedef Bool (*NameCheckFunc) (char *name);
|
||||
typedef int (*InitFpeFunc) (FontPathElementPtr fpe);
|
||||
typedef int (*FreeFpeFunc) (FontPathElementPtr fpe);
|
||||
typedef int (*ResetFpeFunc) (FontPathElementPtr fpe);
|
||||
-typedef int (*OpenFontFunc) ( pointer client,
|
||||
+typedef int (*OpenFontFunc) ( void *client,
|
||||
FontPathElementPtr fpe,
|
||||
Mask flags,
|
||||
char* name,
|
||||
@@ -168,55 +168,55 @@ typedef int (*OpenFontFunc) ( pointer client,
|
||||
char** aliasName,
|
||||
FontPtr non_cachable_font);
|
||||
typedef void (*CloseFontFunc) (FontPathElementPtr fpe, FontPtr pFont);
|
||||
-typedef int (*ListFontsFunc) (pointer client,
|
||||
+typedef int (*ListFontsFunc) (void *client,
|
||||
FontPathElementPtr fpe,
|
||||
char* pat,
|
||||
int len,
|
||||
int max,
|
||||
FontNamesPtr names);
|
||||
|
||||
-typedef int (*StartLfwiFunc) (pointer client,
|
||||
+typedef int (*StartLfwiFunc) (void *client,
|
||||
FontPathElementPtr fpe,
|
||||
char* pat,
|
||||
int len,
|
||||
int max,
|
||||
- pointer* privatep);
|
||||
+ void ** privatep);
|
||||
|
||||
-typedef int (*NextLfwiFunc) (pointer client,
|
||||
+typedef int (*NextLfwiFunc) (void *client,
|
||||
FontPathElementPtr fpe,
|
||||
char** name,
|
||||
int* namelen,
|
||||
FontInfoPtr* info,
|
||||
int* numFonts,
|
||||
- pointer private);
|
||||
+ void *private);
|
||||
|
||||
typedef int (*WakeupFpeFunc) (FontPathElementPtr fpe,
|
||||
unsigned long* LastSelectMask);
|
||||
|
||||
-typedef void (*ClientDiedFunc) (pointer client,
|
||||
+typedef void (*ClientDiedFunc) (void *client,
|
||||
FontPathElementPtr fpe);
|
||||
|
||||
-typedef int (*LoadGlyphsFunc) (pointer client,
|
||||
+typedef int (*LoadGlyphsFunc) (void *client,
|
||||
FontPtr pfont,
|
||||
Bool range_flag,
|
||||
unsigned int nchars,
|
||||
int item_size,
|
||||
unsigned char* data);
|
||||
|
||||
-typedef int (*StartLaFunc) (pointer client,
|
||||
+typedef int (*StartLaFunc) (void *client,
|
||||
FontPathElementPtr fpe,
|
||||
char* pat,
|
||||
int len,
|
||||
int max,
|
||||
- pointer* privatep);
|
||||
+ void ** privatep);
|
||||
|
||||
-typedef int (*NextLaFunc) (pointer client,
|
||||
+typedef int (*NextLaFunc) (void *client,
|
||||
FontPathElementPtr fpe,
|
||||
char** namep,
|
||||
int* namelenp,
|
||||
char** resolvedp,
|
||||
int* resolvedlenp,
|
||||
- pointer private);
|
||||
+ void *private);
|
||||
|
||||
typedef void (*SetPathFunc)(void);
|
||||
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
From b4184619702b6801e3a2ea9733ae1620fa4ceda7 Mon Sep 17 00:00:00 2001
|
||||
From: Keith Packard <keithp@keithp.com>
|
||||
Date: Mon, 16 Dec 2013 09:43:41 -0800
|
||||
Subject: [PATCH] inputproto: Allow library users to avoid having the 'Pointer'
|
||||
typedef declared
|
||||
|
||||
'Pointer' collides with too many other application names, so stop
|
||||
using it locally and allow applications to avoid having it in the API.
|
||||
|
||||
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||
---
|
||||
XIproto.h | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/XIproto.h b/XIproto.h
|
||||
index e00ab61..82323d8 100644
|
||||
--- a/XIproto.h
|
||||
+++ b/XIproto.h
|
||||
@@ -85,12 +85,14 @@ typedef struct _XExtEventInfo
|
||||
BYTE word;
|
||||
} XExtEventInfo;
|
||||
|
||||
-typedef unsigned char *Pointer;
|
||||
+#ifndef _XITYPEDEF_POINTER
|
||||
+typedef void *Pointer;
|
||||
+#endif
|
||||
|
||||
struct tmask
|
||||
{
|
||||
Mask mask;
|
||||
- Pointer dev;
|
||||
+ void *dev;
|
||||
};
|
||||
|
||||
/*********************************************************
|
||||
--
|
||||
1.9.0
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
From 8405ee4552565825d776e6a8963d33d9cd9cddf0 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed, 11 Dec 2013 13:25:06 -0500
|
||||
Subject: [PATCH presentproto 1/4] Force Window and Pixmap to be CARD32 on the
|
||||
wire
|
||||
|
||||
If you don't do this then the client libs on 64-bit machines see them as
|
||||
XIDs, which are 64-bit wide (sigh), which ruins the wire encoding and
|
||||
nothing works.
|
||||
|
||||
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
---
|
||||
presentproto.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/presentproto.h b/presentproto.h
|
||||
index 8303a94..ee65fa4 100644
|
||||
--- a/presentproto.h
|
||||
+++ b/presentproto.h
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
#include <X11/extensions/presenttokens.h>
|
||||
|
||||
+#define Window CARD32
|
||||
+#define Pixmap CARD32
|
||||
#define Region CARD32
|
||||
#define XSyncFence CARD32
|
||||
#define EventID CARD32
|
||||
@@ -235,6 +237,8 @@ typedef struct {
|
||||
|
||||
#define sz_xPresentRedirectNotify 104
|
||||
|
||||
+#undef Window
|
||||
+#undef Pixmap
|
||||
#undef Region
|
||||
#undef XSyncFence
|
||||
#undef EventID
|
||||
--
|
||||
1.9.0
|
||||
|
||||
60
randrproto-0001-Add-a-GUID-property.patch
Normal file
60
randrproto-0001-Add-a-GUID-property.patch
Normal file
@ -0,0 +1,60 @@
|
||||
From 19fc4c5a72eb9919d720ad66734029d9f8e313b1 Mon Sep 17 00:00:00 2001
|
||||
From: Aaron Plattner <aplattner@nvidia.com>
|
||||
Date: Tue, 12 Jun 2012 12:32:19 -0700
|
||||
Subject: [PATCH 1/4] Add a "GUID" property
|
||||
|
||||
This property represents the globally-unique identifier of the connected
|
||||
display, if one is available.
|
||||
|
||||
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
|
||||
Reviewed-by: Andy Ritger <aritger@nvidia.com>
|
||||
---
|
||||
randr.h | 1 +
|
||||
randrproto.txt | 12 ++++++++++++
|
||||
2 files changed, 13 insertions(+)
|
||||
|
||||
diff --git a/randr.h b/randr.h
|
||||
index 33d22fb..3c6721b 100644
|
||||
--- a/randr.h
|
||||
+++ b/randr.h
|
||||
@@ -180,6 +180,7 @@ typedef unsigned long XRandrModeFlags;
|
||||
#define RR_PROPERTY_CLONE_LIST "CloneList"
|
||||
#define RR_PROPERTY_BORDER "Border"
|
||||
#define RR_PROPERTY_BORDER_DIMENSIONS "BorderDimensions"
|
||||
+#define RR_PROPERTY_GUID "GUID"
|
||||
|
||||
/* roles this device can carry out */
|
||||
#define RR_Capability_None 0
|
||||
diff --git a/randrproto.txt b/randrproto.txt
|
||||
index 2bf065f..f82407c 100644
|
||||
--- a/randrproto.txt
|
||||
+++ b/randrproto.txt
|
||||
@@ -1957,6 +1957,17 @@ doesn't handle a mandatory property correctly.
|
||||
2 = left/right and top/bottom borders can be specified independently
|
||||
4 = all four borders can be specified independently
|
||||
|
||||
+ "GUID" aka RR_PROPERTY_GUID
|
||||
+ Type: INTEGER
|
||||
+ Format: 8
|
||||
+ Num items: 16
|
||||
+ Flags: Immutable
|
||||
+ Range/List: -
|
||||
+
|
||||
+ Some display devices, such as DisplayPort 1.2 devices, have globally
|
||||
+ unique identifiers. When such an identifier is available, this property
|
||||
+ contains its raw bytes.
|
||||
+
|
||||
|
||||
9.2 Properties introduced with version 1.2 of the RandR extension
|
||||
|
||||
@@ -1990,6 +2001,7 @@ Property Immutable Mandatory since
|
||||
──────── ───────── ───────────────
|
||||
Border yes not mandatory
|
||||
BorderDimensions yes: static not mandatory
|
||||
+GUID yes not mandatory
|
||||
|
||||
❧❧❧❧❧❧❧❧❧❧❧
|
||||
|
||||
--
|
||||
1.9.0
|
||||
|
||||
16
sources
16
sources
@ -3,27 +3,27 @@
|
||||
998e5904764b82642cc63d97b4ba9e95 damageproto-1.2.1.tar.bz2
|
||||
4ee175bbd44d05c34d43bb129be5098a dmxproto-2.3.1.tar.bz2
|
||||
b2721d5d24c04d9980a0c6540cb5396a dri2proto-2.8.tar.bz2
|
||||
a3d2cbe60a9ca1bf3aea6c93c817fee3 dri3proto-1.0.tar.bz2
|
||||
98bd86a13686f65f0873070fdee6efc7 evieext-1.1.1.tar.bz2
|
||||
e7431ab84d37b2678af71e29355e101d fixesproto-5.0.tar.bz2
|
||||
c5f4f1fb4ba7766eedbc9489e81f3be2 fontsproto-2.1.2.tar.bz2
|
||||
36934d00b00555eaacde9f091f392f97 fontsproto-2.1.3.tar.bz2
|
||||
5565f1b0facf4a59c2778229c1f70d10 glproto-1.4.17.tar.bz2
|
||||
94db391e60044e140c9854203d080654 inputproto-2.3.tar.bz2
|
||||
677ea8523eec6caca86121ad2dca0b71 kbproto-1.0.6.tar.bz2
|
||||
2d569c75884455c7148d133d341e8fd6 presentproto-1.0.tar.bz2
|
||||
ce4d0b05675968e4c83e003cc809660d randrproto-1.4.0.tar.bz2
|
||||
1b4e5dede5ea51906f1530ca1e21d216 recordproto-1.14.2.tar.bz2
|
||||
a914ccc1de66ddeb4b611c6b0686e274 renderproto-0.11.1.tar.bz2
|
||||
cfdb57dae221b71b2703f8e2980eaaf4 resourceproto-1.2.0.tar.bz2
|
||||
edd8a73775e8ece1d69515dd17767bfb scrnsaverproto-1.2.2.tar.bz2
|
||||
c3b348c6e2031b72b11ae63fc7f805c2 videoproto-2.3.1.tar.bz2
|
||||
e658641595327d3990eab70fdb55ca8b videoproto-2.3.2.tar.bz2
|
||||
5f4847c78e41b801982c8a5e06365b24 xcmiscproto-1.2.2.tar.bz2
|
||||
70c90f313b4b0851758ef77b95019584 xextproto-7.3.0.tar.bz2
|
||||
120e226ede5a4687b25dd357cc9b8efe xf86bigfontproto-1.2.0.tar.bz2
|
||||
a036dc2fcbf052ec10621fd48b68dbb1 xf86dgaproto-2.1.tar.bz2
|
||||
1d716d0dac3b664e5ee20c69d34bc10e xf86driproto-2.1.1.tar.bz2
|
||||
ca63bbb31cf5b7f37b2237e923ff257a xf86miscproto-0.9.3.tar.bz2
|
||||
e793ecefeaecfeabd1aed6a01095174e xf86vidmodeproto-2.3.1.tar.bz2
|
||||
9959fe0bfb22a0e7260433b8d199590a xineramaproto-1.2.1.tar.bz2
|
||||
9c0203c3bee4bac432ec504dc45712ed xproto-7.0.24.tar.bz2
|
||||
4dc2464bfeade23dab5de38da0f6b1b5 xproto-7.0.26.tar.bz2
|
||||
9de22ca1522008c28fb03dfc41ba2d30 xproxymanagementprotocol-1.0.3.tar.bz2
|
||||
94db391e60044e140c9854203d080654 inputproto-2.3.tar.bz2
|
||||
2d569c75884455c7148d133d341e8fd6 presentproto-1.0.tar.bz2
|
||||
a3d2cbe60a9ca1bf3aea6c93c817fee3 dri3proto-1.0.tar.bz2
|
||||
213900c601f7d4226a889ad8698002f8 xextproto-7.2.99.901.tar.bz2
|
||||
5565f1b0facf4a59c2778229c1f70d10 glproto-1.4.17.tar.bz2
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
Summary: X.Org X11 Protocol headers
|
||||
Name: xorg-x11-proto-devel
|
||||
Version: 7.7
|
||||
Release: 9%{?dist}
|
||||
Release: 10%{?dist}
|
||||
License: MIT
|
||||
Group: Development/System
|
||||
URL: http://www.x.org
|
||||
@ -21,7 +21,7 @@ Source31: http://xorg.freedesktop.org/archive/individual/proto/dri2proto-2.8.tar
|
||||
Source33: http://xorg.freedesktop.org/pub/individual/proto/dri3proto-1.0.tar.bz2
|
||||
Source4: http://xorg.freedesktop.org/archive/individual/proto/evieext-1.1.1.tar.bz2
|
||||
Source5: http://xorg.freedesktop.org/archive/individual/proto/fixesproto-5.0.tar.bz2
|
||||
Source7: http://xorg.freedesktop.org/archive/individual/proto/fontsproto-2.1.2.tar.bz2
|
||||
Source7: http://xorg.freedesktop.org/archive/individual/proto/fontsproto-2.1.3.tar.bz2
|
||||
Source8: http://xorg.freedesktop.org/archive/individual/proto/glproto-1.4.17.tar.bz2
|
||||
Source9: http://xorg.freedesktop.org/archive/individual/proto/inputproto-2.3.tar.bz2
|
||||
Source10: http://xorg.freedesktop.org/archive/individual/proto/kbproto-1.0.6.tar.bz2
|
||||
@ -31,22 +31,23 @@ Source14: http://xorg.freedesktop.org/archive/individual/proto/recordproto-1.14.
|
||||
Source15: http://xorg.freedesktop.org/archive/individual/proto/renderproto-0.11.1.tar.bz2
|
||||
Source16: http://xorg.freedesktop.org/archive/individual/proto/resourceproto-1.2.0.tar.bz2
|
||||
Source17: http://xorg.freedesktop.org/archive/individual/proto/scrnsaverproto-1.2.2.tar.bz2
|
||||
Source19: http://xorg.freedesktop.org/archive/individual/proto/videoproto-2.3.1.tar.bz2
|
||||
Source19: http://xorg.freedesktop.org/archive/individual/proto/videoproto-2.3.2.tar.bz2
|
||||
Source20: http://xorg.freedesktop.org/archive/individual/proto/xcmiscproto-1.2.2.tar.bz2
|
||||
Source21: http://xorg.freedesktop.org/archive/individual/proto/xextproto-7.2.99.901.tar.bz2
|
||||
Source21: http://xorg.freedesktop.org/archive/individual/proto/xextproto-7.3.0.tar.bz2
|
||||
Source22: http://xorg.freedesktop.org/archive/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
|
||||
Source23: http://xorg.freedesktop.org/archive/individual/proto/xf86dgaproto-2.1.tar.bz2
|
||||
Source24: http://xorg.freedesktop.org/archive/individual/proto/xf86driproto-2.1.1.tar.bz2
|
||||
Source25: http://xorg.freedesktop.org/archive/individual/proto/xf86miscproto-0.9.3.tar.bz2
|
||||
Source27: http://xorg.freedesktop.org/archive/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
|
||||
Source28: http://xorg.freedesktop.org/archive/individual/proto/xineramaproto-1.2.1.tar.bz2
|
||||
Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.24.tar.bz2
|
||||
Source29: http://xorg.freedesktop.org/archive/individual/proto/xproto-7.0.26.tar.bz2
|
||||
Source30: http://xorg.freedesktop.org/archive/individual/proto/xproxymanagementprotocol-1.0.3.tar.bz2
|
||||
|
||||
Source40: make-git-snapshot.sh
|
||||
|
||||
Patch0: fontsproto-0001-Replace-pointer-with-the-equivalent-void.patch
|
||||
Patch1: xproto-0001-Replace-pointer-with-explicit-void.patch
|
||||
Patch0: inputproto-0001-Allow-library-users-to-avoid-having-the-P.patch
|
||||
Patch1: presentproto-0001-Force-Window-and-Pixmap-to-be-CARD32-on-the-wire.patch
|
||||
Patch2: randrproto-0001-Add-a-GUID-property.patch
|
||||
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-util-macros >= 1.0.2-1
|
||||
@ -61,17 +62,23 @@ Requires: pkgconfig
|
||||
%description
|
||||
X.Org X11 Protocol headers
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a7 -a8 -a9 -a10 -a13 -a14 -a15 -a16 -a17 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a29 -a30 -a31 -a32 -a33
|
||||
|
||||
pushd fontsproto-*
|
||||
pushd inputproto-*
|
||||
%patch0 -p1
|
||||
popd
|
||||
|
||||
pushd xproto-*
|
||||
pushd presentproto-*
|
||||
%patch1 -p1
|
||||
popd
|
||||
|
||||
pushd randrproto-*
|
||||
%patch2 -p1
|
||||
popd
|
||||
|
||||
|
||||
%build
|
||||
|
||||
# Proceed through each proto package directory, building them all
|
||||
@ -90,10 +97,9 @@ done
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
for dir in $(ls -1) ; do
|
||||
pushd $dir
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%make_install
|
||||
install -m 444 COPYING-${dir%%-*} $OLDPWD
|
||||
popd
|
||||
done
|
||||
@ -108,11 +114,8 @@ mv $RPM_BUILD_ROOT%{_docdir}/xproxymanagementprotocol/PM_spec .
|
||||
# keep things building even if you have the html doc tools for xmlto installed
|
||||
rm -f $RPM_BUILD_ROOT%{_docdir}/*/*.{html,svg}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING-*
|
||||
%doc *.txt
|
||||
%doc PM_spec
|
||||
@ -288,6 +291,13 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/pkgconfig/xproxymngproto.pc
|
||||
|
||||
%changelog
|
||||
* Wed Apr 16 2014 Hans de Goede <hdegoede@redhat.com> - 7.7-10
|
||||
- fontsproto-2.1.3
|
||||
- videoproto-2.3.2
|
||||
- xextproto-7.3.0
|
||||
- xproto-7.0.26
|
||||
- Cherry pick some unreleased fixes from upstream git
|
||||
|
||||
* Thu Jan 23 2014 Adam Jackson <ajax@redhat.com> 7.7-9
|
||||
- Backport pointer-to-void* changes
|
||||
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 148d89f0b3a652acc54b1a21807ffd6d0e81e279 Mon Sep 17 00:00:00 2001
|
||||
From: Keith Packard <keithp@keithp.com>
|
||||
Date: Sun, 15 Dec 2013 08:27:09 -0800
|
||||
Subject: [PATCH] Replace 'pointer' with explicit 'void *'
|
||||
|
||||
To get rid of the 'pointer' typedef, stop using it locally. That way,
|
||||
when _XTYPEDEF_POINTER is defined before Xdefs.h is included, it won't
|
||||
get defined and Xdefs.h will still compile.
|
||||
|
||||
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||||
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
---
|
||||
Xdefs.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Xdefs.h b/Xdefs.h
|
||||
index 46ffdad..e25a208 100644
|
||||
--- a/Xdefs.h
|
||||
+++ b/Xdefs.h
|
||||
@@ -101,8 +101,8 @@ typedef FSID AccContext;
|
||||
typedef struct timeval **OSTimePtr;
|
||||
|
||||
|
||||
-typedef void (* BlockHandlerProcPtr)(pointer /* blockData */,
|
||||
+typedef void (* BlockHandlerProcPtr)(void * /* blockData */,
|
||||
OSTimePtr /* pTimeout */,
|
||||
- pointer /* pReadmask */);
|
||||
+ void * /* pReadmask */);
|
||||
|
||||
#endif
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user