On 14-01-22 12:45 PM, Keith Packard wrote: > Gaetan Nadon <mems...@videotron.ca> writes: > >> Now applies correctly, >> >> Reviewed-by: Gaetan Nadon <mems...@videotron.ca> > I've pushed just this patch (having swapped the order of the two patches > locally). > d84789d..431a426 master -> master > > Did you want for your review to apply to the const pattern patch as well > though? >
With the original const patch before the swap, I recompiled: libXfont: (6371fcf2b60e) patcache.c:130:1: error: conflicting types for 'CacheFontPattern' /home/nadon/xorg/inst/include/X11/fonts/font.h:141:18: note: previous declaration of 'CacheFontPattern' was here patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern' /home/nadon/xorg/inst/include/X11/fonts/font.h:151:21: note: previous declaration of 'FindCachedFontPattern' was here app-xfs: (b7cd80d37de) difs/fonts.c: In function 'FontWakeup': difs/fonts.c:172:52: warning: declaration of 'LastSelectMask' shadows a global declaration [-Wshadow] ./include/globals.h:74:15: warning: shadowed declaration is here [-Wshadow] difs/fonts.c: At top level: difs/fonts.c:1406:1: error: conflicting types for 'RegisterFPEFunctions' /home/nadon/xorg/inst/include/X11/fonts/fontproto.h:28:12: note: previous declaration of 'RegisterFPEFunctions' was here difs/fonts.c: In function 'RegisterFPEFunctions': difs/fonts.c:1432:45: warning: assignment from incompatible pointer type [enabled by default] xserver: (2d2d49dab5c5): OK I cannot find where FONT_PATH_ELEMENT_NAME_CONST is defined.
_______________________________________________ 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