diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 12:33:20 +0200 |
| commit | be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779 (patch) | |
| tree | 807b5640d1fedc88ddcda752f101ffdb3071092a /libXpm/sxpm/sxpm.c | |
| parent | 11b60c4ebaf348b01051bfff19f947b073028a99 (diff) | |
| parent | 6dd755aa923291db2501cc5c22e409c41a70e3c1 (diff) | |
| download | vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.gz vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.tar.bz2 vcxsrv-be0d35a4a1b1dc5bde14d1b027f4f0cb58b5a779.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Update following packages:
Conflicts:
X11/Xwinsock.h
apps/xhost/xhost.c
libXaw/src/Vendor.c
libXfont/include/X11/fonts/bdfint.h
libXfont/src/fontfile/catalogue.c
Diffstat (limited to 'libXpm/sxpm/sxpm.c')
| -rw-r--r-- | libXpm/sxpm/sxpm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libXpm/sxpm/sxpm.c b/libXpm/sxpm/sxpm.c index a5eaa325e..87860c038 100644 --- a/libXpm/sxpm/sxpm.c +++ b/libXpm/sxpm/sxpm.c @@ -109,9 +109,9 @@ static char *plaid[] = { #define xrdb XtDatabase(dpy) static Colormap colormap; -void Usage(void); +void Usage(void) _X_NORETURN; void ErrorMessage(int ErrorStatus, const char *tag); -void Punt(int i); +void Punt(int i) _X_NORETURN; void VersionInfo(void); void kinput(Widget widget, char *tag, XEvent *xe, Boolean *b); void GetNumbers(int num, int *format_return, @@ -569,9 +569,6 @@ main( XtMainLoop(); } Punt(0); - - /* Muffle gcc */ - return 0; } void |