Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/specs/libX11/CH08.xml
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/queryobj.c
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_readpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mkfontscale/list.h
	pixman/pixman/Makefile.win32
	xorg-server/dix/devices.c
	xorg-server/dix/events.c
	xorg-server/dix/inpututils.c
	xorg-server/fb/fbbltone.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/xfree86/common/xf86Module.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xfree86/man/xorg.conf.man
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/include/input.h
	xorg-server/include/inputstr.h
	xorg-server/mi/mieq.c
	xorg-server/randr/rrscreen.c
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in

1 files changed, 5 insertions, 3 deletions

diff --git a/mkfontscale/list.h b/mkfontscale/list.h
index 8b3c82f74..42e4c0756 100644
--- a/mkfontscale/list.h
+++ b/mkfontscale/list.h
@@ -23,7 +23,9 @@
 #ifndef _MKS_LIST_H_

 #define _MKS_LIST_H_ 1

 

-char *dsprintf(char *f, ...);

+#include <X11/Xfuncproto.h> /* for _X_ATTRIBUTE_PRINTF */

+

+char *dsprintf(char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

 

 typedef struct _List {

     char *value;

@@ -33,8 +35,8 @@ typedef struct _List {
 int listMember(char *elt, ListPtr list);

 ListPtr listCons(char *car, ListPtr cdr);

 ListPtr listAdjoin(char *car, ListPtr cdr);

-ListPtr listConsF(ListPtr cdr, char *f, ...);

-ListPtr listAdjoinF(ListPtr cdr, char *f, ...);

+ListPtr listConsF(ListPtr cdr, char *f, ...) _X_ATTRIBUTE_PRINTF(2,3);

+ListPtr listAdjoinF(ListPtr cdr, char *f, ...) _X_ATTRIBUTE_PRINTF(2,3);

 int listLength(ListPtr list);

 ListPtr appendList(ListPtr first, ListPtr second);

 ListPtr makeList(char **a, int n, ListPtr old, int begin);