summaryrefslogtreecommitdiff
path: root/mpm/misc.h
diff options
context:
space:
mode:
Diffstat (limited to 'mpm/misc.h')
-rw-r--r--mpm/misc.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/mpm/misc.h b/mpm/misc.h
index d46efd75be4c..75aed6cff620 100644
--- a/mpm/misc.h
+++ b/mpm/misc.h
@@ -16,20 +16,8 @@
#include <math.h>
#include <ctype.h>
#include <string.h>
+#include "global.h"
-#ifdef __GLIBC__
-#ifdef _IO_getc_unlocked
-#undef getc
-#define getc(f) _IO_getc_unlocked(f)
-#endif
-#ifdef _IO_putc_unlocked
-#undef putc
-#undef putchar
-#define putc(c, f) _IO_putc_unlocked(c, f)
-#define putchar(c) _IO_putc_unlocked(c, stdout)
-#endif
-#endif /* __GLIBC__ */
-
extern char *progname;
extern int linenum;
extern int wantwarn;
@@ -39,11 +27,6 @@ extern void WARNING(const char *, ...);
#define eq(s,t) (strcmp(s,t) == 0)
-inline int max(int x, int y) { return x > y ? x : y; }
-inline int min(int x, int y) { return x > y ? y : x; }
-// already defined in stdlib.h:
-//inline int abs(int x) { return (x >= 0) ? x : -x; }
-
extern int dbg;
extern int pn, userpn; // actual and user-defined page numbers