diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
| commit | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (patch) | |
| tree | ea689cdd51f395980ddc37dc33781635976f3a16 /apps/xwininfo/dsimple.h | |
| parent | aec798fb4dc72d616732d0fa711faffaa8cd7590 (diff) | |
| parent | 2acb86c9b086bdb9a3897db0b93820652e07cb59 (diff) | |
| download | vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.gz vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.bz2 vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xwininfo/xwininfo.c
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'apps/xwininfo/dsimple.h')
| -rw-r--r-- | apps/xwininfo/dsimple.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/xwininfo/dsimple.h b/apps/xwininfo/dsimple.h index d0dd71ae9..7dacdee92 100644 --- a/apps/xwininfo/dsimple.h +++ b/apps/xwininfo/dsimple.h @@ -55,7 +55,7 @@ void Setup_Display_And_Screen (const char *displayname, xcb_window_t Select_Window (xcb_connection_t *, const xcb_screen_t *, int); xcb_window_t Window_With_Name (xcb_connection_t *, xcb_window_t, const char *); -void Fatal_Error (const char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2); +void Fatal_Error (const char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2) _X_COLD; void Print_X_Error (xcb_connection_t *, xcb_generic_error_t *); |