diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-05-19 14:39:22 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-05-22 11:17:59 -0700 |
| commit | f25ca898c54cb88c7886005fc75a53762c42710b (patch) | |
| tree | 1169450f3194cec4823a11d148d36e7c0c845c94 | |
| parent | 7413886d650aef492ecbfdc4298c2d92d9af5f87 (diff) | |
XQuartz: Mark functions _X_NORETURN
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | hw/xquartz/darwin.c | 4 | ||||
| -rw-r--r-- | hw/xquartz/mach-startup/stub.c | 1 | ||||
| -rw-r--r-- | hw/xquartz/quartzStartup.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index e90c33ec2..fa8d4ced2 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -772,8 +772,8 @@ void ddxGiveUp( void ) * made to restore all original setting of the displays. Also all devices * are closed. */ -void AbortDDX( void ) -{ +_X_NORETURN +void AbortDDX( void ) { ErrorF( " AbortDDX\n" ); OsAbort(); } diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c index 8319dd06e..d8e4abdd1 100644 --- a/hw/xquartz/mach-startup/stub.c +++ b/hw/xquartz/mach-startup/stub.c @@ -164,6 +164,7 @@ static void send_fd_handoff(int connected_fd, int launchd_fd) { close(connected_fd); } +__attribute__((__noreturn__)) static void signal_handler(int sig) { if(x11app_pid) kill(x11app_pid, sig); diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c index 00a9e48fd..25ef76efa 100644 --- a/hw/xquartz/quartzStartup.c +++ b/hw/xquartz/quartzStartup.c @@ -56,6 +56,7 @@ struct arg { char **envp; }; +_X_NORETURN static void server_thread (void *arg) { struct arg args = *((struct arg *)arg); free(arg); |