<html> <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> </head> <body bgcolor="#FFFFFF" text="#000000"> <div class="moz-cite-prefix">On 14-01-22 12:45 PM, Keith Packard wrote: </div> <blockquote cite="mid:86sisf7vwm.fsf@miki.keithp.com" type="cite"> <pre wrap="">Gaetan Nadon <a class="moz-txt-link-rfc2396E" href="mailto:memsize@videotron.ca"><memsize@videotron.ca></a> writes: </pre> <blockquote type="cite"> <pre wrap="">Now applies correctly, Reviewed-by: Gaetan Nadon <a class="moz-txt-link-rfc2396E" href="mailto:memsize@videotron.ca"><memsize@videotron.ca></a> </pre> </blockquote> <pre wrap=""> 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? </pre> </blockquote> With the original const patch before the swap, I recompiled: libXfont: (6371fcf2b60e) <blockquote><tt>patcache.c:130:1: error: conflicting types for 'CacheFontPattern'</tt><tt> </tt><tt>/home/nadon/xorg/inst/include/X11/fonts/font.h:141:18: note: previous declaration of 'CacheFontPattern' was here</tt><tt> </tt><tt>patcache.c:176:1: error: conflicting types for 'FindCachedFontPattern'</tt><tt> </tt><tt>/home/nadon/xorg/inst/include/X11/fonts/font.h:151:21: note: previous declaration of 'FindCachedFontPattern' was here</tt> </blockquote> app-xfs: (b7cd80d37de) <blockquote><tt>difs/fonts.c: In function ‘FontWakeup’:</tt><tt> </tt><tt>difs/fonts.c:172:52: warning: declaration of ‘LastSelectMask’ shadows a global declaration [-Wshadow]</tt><tt> </tt><tt>./include/globals.h:74:15: warning: shadowed declaration is here [-Wshadow]</tt><tt> </tt><tt>difs/fonts.c: At top level:</tt><tt> </tt><tt>difs/fonts.c:1406:1: error: conflicting types for ‘RegisterFPEFunctions’</tt><tt> </tt><tt>/home/nadon/xorg/inst/include/X11/fonts/fontproto.h:28:12: note: previous declaration of ‘RegisterFPEFunctions’ was here</tt><tt> </tt><tt>difs/fonts.c: In function ‘RegisterFPEFunctions’:</tt><tt> </tt><tt>difs/fonts.c:1432:45: warning: assignment from incompatible pointer type [enabled by default]</tt> </blockquote> xserver: (2d2d49dab5c5): OK I cannot find where FONT_PATH_ELEMENT_NAME_CONST is defined. </body> </html>