aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xnest/Display.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-08 09:32:47 +0100
committermarha <marha@users.sourceforge.net>2011-12-08 09:32:47 +0100
commitacd000667561cb9978ead7f14d4fbb97c1a8e727 (patch)
tree21668e5efeb08af34de6c679d4c46cc6fe5d7b64 /xorg-server/hw/xnest/Display.c
parent893624a6c15d4ee6cf1d46e4ad29282c72bee962 (diff)
parent5b178ff5a5f0b6e481cf9fd9749eb7ef9581c987 (diff)
downloadvcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.gz
vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.tar.bz2
vcxsrv-acd000667561cb9978ead7f14d4fbb97c1a8e727.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xnest/Display.c')
-rw-r--r--xorg-server/hw/xnest/Display.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/hw/xnest/Display.c b/xorg-server/hw/xnest/Display.c
index 7acad755c..3176b60d7 100644
--- a/xorg-server/hw/xnest/Display.c
+++ b/xorg-server/hw/xnest/Display.c
@@ -55,6 +55,11 @@ Pixmap xnestScreenSaverPixmap;
XlibGC xnestBitmapGC;
unsigned long xnestEventMask;
+#ifdef __SUNPRO_C
+/* prevent "Function has no return statement" error for x_io_error_handler */
+#pragma does_not_return(exit)
+#endif
+
static int _X_NORETURN
x_io_error_handler (Display *dpy) {
ErrorF("Lost connection to X server: %s\n", strerror(errno));