On 20.01.2014 01:52, Keith Packard wrote:
Gaetan Nadon <mems...@videotron.ca> writes:
On 14-01-19 04:01 PM, Keith Packard wrote:
The pointer typedef is being removed because it causes so many
compiler warnings when -Wshadow is enabled.
Signed-off-by: Keith Packard <kei...@keithp.com>
---
fontproto.h | 2 +-
fontstruct.h | 36 ++++++++++++++++++------------------
2 files changed, 19 insertions(+), 19 deletions(-)
Code changes are ok, but patch does not apply. Looks like lines are offset.
Applied patch fontproto.h cleanly.
Applying patch fontstruct.h with 2 rejects...
Hunk #1 applied cleanly.
Rejected hunk #2.
Rejected hunk #3.
I am on master branch top commit d84789dc33
Right, this patch is on top of a previous fontsproto patch which also
has not been applied.
I assume there´s not only a fontsproto patch as this patch alone breaks libXfont
for obvious reasons.
That one allowed paths and patterns to be declared
const. I'll attach that here; the pointer patch comes after this one.
So many patches...
Not enough ;-)
CC patcache.lo
. ../../config.h
. ../../include/X11/fonts/fontmisc.h
.. /home/knut/fast/xorg/X11-t/usr/include/X11/Xfuncs.h
... /home/knut/fast/xorg/X11-t/usr/include/X11/Xosdefs.h
... /usr/include/string.h
.... /usr/include/features.h
..... /usr/include/sys/cdefs.h
...... /usr/include/bits/wordsize.h
..... /usr/include/gnu/stubs.h
...... /usr/include/gnu/stubs-32.h
.... /usr/lib/gcc/i586-suse-linux/4.8/include/stddef.h
.... /usr/include/xlocale.h
.... /usr/include/bits/string.h
.... /usr/include/bits/string2.h
..... /usr/include/endian.h
...... /usr/include/bits/endian.h
...... /usr/include/bits/byteswap.h
....... /usr/include/bits/types.h
........ /usr/include/bits/wordsize.h
........ /usr/include/bits/typesizes.h
....... /usr/include/bits/wordsize.h
....... /usr/include/bits/byteswap-16.h
..... /usr/include/stdlib.h
...... /usr/lib/gcc/i586-suse-linux/4.8/include/stddef.h
.. /usr/include/stdlib.h
... /usr/lib/gcc/i586-suse-linux/4.8/include/stddef.h
... /usr/include/bits/waitflags.h
... /usr/include/bits/waitstatus.h
... /usr/include/sys/types.h
.... /usr/include/time.h
.... /usr/lib/gcc/i586-suse-linux/4.8/include/stddef.h
.... /usr/include/sys/select.h
..... /usr/include/bits/select.h
...... /usr/include/bits/wordsize.h
..... /usr/include/bits/sigset.h
..... /usr/include/time.h
..... /usr/include/bits/time.h
.... /usr/include/sys/sysmacros.h
.... /usr/include/bits/pthreadtypes.h
..... /usr/include/bits/wordsize.h
... /usr/include/alloca.h
.... /usr/lib/gcc/i586-suse-linux/4.8/include/stddef.h
... /usr/include/bits/stdlib-bsearch.h
... /usr/include/bits/stdlib-float.h
.. /usr/include/stdio.h
... /usr/lib/gcc/i586-suse-linux/4.8/include/stddef.h
... /usr/include/libio.h
.... /usr/include/_G_config.h
..... /usr/lib/gcc/i586-suse-linux/4.8/include/stddef.h
..... /usr/include/wchar.h
.... /usr/lib/gcc/i586-suse-linux/4.8/include/stdarg.h
... /usr/include/bits/stdio_lim.h
... /usr/include/bits/sys_errlist.h
... /usr/include/bits/stdio.h
.. /usr/include/unistd.h
... /usr/include/bits/posix_opt.h
... /usr/include/bits/environments.h
.... /usr/include/bits/wordsize.h
... /usr/lib/gcc/i586-suse-linux/4.8/include/stddef.h
... /usr/include/bits/confname.h
... /usr/include/getopt.h
.. /home/knut/fast/xorg/X11-t/usr/include/X11/Xdefs.h
. /home/knut/fast/xorg/X11-t/usr/include/X11/fonts/fontstruct.h
.. /home/knut/fast/xorg/X11-t/usr/include/X11/Xproto.h
... /home/knut/fast/xorg/X11-t/usr/include/X11/Xmd.h
... /home/knut/fast/xorg/X11-t/usr/include/X11/Xprotostr.h
.. /home/knut/fast/xorg/X11-t/usr/include/X11/fonts/font.h
... /home/knut/fast/xorg/X11-t/usr/include/X11/fonts/fsmasks.h
.. /home/knut/fast/xorg/X11-t/usr/include/X11/Xfuncproto.h
.. /home/knut/fast/xorg/X11-t/usr/include/X11/fonts/fontproto.h
patcache.c:130:1: error: conflicting types for 'CacheFontPattern'
CacheFontPattern (FontPatternCachePtr cache,
^
In file included from
/home/knut/fast/xorg/X11-t/usr/include/X11/fonts/fontstruct.h:28:0,
from patcache.c:35:
/home/knut/fast/xorg/X11-t/usr/include/X11/fonts/font.h:141:18: note: previous
declaration of 'CacheFontPattern' was here
extern void CacheFontPattern (
^
patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern'
FindCachedFontPattern (FontPatternCachePtr cache,
^
In file included from
/home/knut/fast/xorg/X11-t/usr/include/X11/fonts/fontstruct.h:28:0,
from patcache.c:35:
/home/knut/fast/xorg/X11-t/usr/include/X11/fonts/font.h:151:21: note: previous
declaration of 'FindCachedFontPattern' was here
extern FontPtr FindCachedFontPattern (
cu,
knut
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
