aboutsummaryrefslogtreecommitdiff
path: root/apps/xcalc/xcalc.h
diff options
context:
space:
mode:
Diffstat (limited to 'apps/xcalc/xcalc.h')
-rw-r--r--apps/xcalc/xcalc.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/apps/xcalc/xcalc.h b/apps/xcalc/xcalc.h
index 855dc4a46..1492a01d8 100644
--- a/apps/xcalc/xcalc.h
+++ b/apps/xcalc/xcalc.h
@@ -37,6 +37,10 @@ from the X Consortium.
#ifndef _XCALC_H_
#define _XCALC_H_
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
@@ -51,13 +55,6 @@ from the X Consortium.
#include <errno.h>
#include <X11/Xlocale.h>
-
-#ifdef SIGNALRETURNSINT
-#define signal_t int
-#else
-#define signal_t void
-#endif
-
#define kRECIP 0 /* reciprocal */
#define kSQR 1 /* square */
#define kSQRT 2 /* square root */
@@ -118,8 +115,8 @@ extern XtActionsRec Actions[];
extern int ActionsCount;
/* math.c */
-extern signal_t fperr(int sig);
-extern signal_t illerr(int sig);
+extern void fperr(int sig) _X_NORETURN;
+extern void illerr(int sig) _X_NORETURN;
extern void fail_op(void);
extern int pre_op(int keynum);
extern void post_op(void);
@@ -151,7 +148,7 @@ extern jmp_buf env;
/* xcalc.c */
extern void do_select(Time time);
extern void draw(char *string);
-extern void Quit(void);
+extern void Quit(void) _X_NORETURN;
extern void ringbell(void);
extern void setflag(int indicator, Boolean on);