diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
| commit | 8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch) | |
| tree | 2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /mkfontscale/list.h | |
| parent | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff) | |
| parent | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff) | |
| download | vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2 vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
Diffstat (limited to 'mkfontscale/list.h')
| -rw-r--r-- | mkfontscale/list.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkfontscale/list.h b/mkfontscale/list.h index 686fd9b09..7403bc0f8 100644 --- a/mkfontscale/list.h +++ b/mkfontscale/list.h @@ -25,7 +25,7 @@ #include <X11/Xfuncproto.h> /* for _X_ATTRIBUTE_PRINTF */ -char *dsprintf(char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); +char *dsprintf(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); typedef struct _List { char *value; |