On 14-01-29 03:10 PM, Keith Packard wrote: > Looks like I did the libXfont changes when I was doing the other warning > fixes and hadn't rebased to current master. Sorry for the noise. > > Here's a patch from current master > 2a3429413df27224ceeddd22500ce43b5431d698 > 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 make[3]: *** [patcache.lo] Error 1 fontsproto top commit: 7f951a3b8ad71211e34a52878a030d5df823c49e I checked that font.h in the installed dir is the same as in the module dir. Other than this patch, everything else is from git master in my source tree. Maybe I am missing something...
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
