from new com_err library; also added empty define of "const" for

non-standard C compilers

diff --git a/include/com_err.h b/include/com_err.h
index 31241acde3c6b03fbfb48c7ee6ef135b1f1c688a..8bb79b969be4d55b2a41ec43d007bb344db2e73f 100644 (file)
--- a/include/com_err.h
+++ b/include/com_err.h
@@ -1,18 +1,38 @@
-#include "mit-sipb-copyright.h"
+/*
+ * Header file for common error description library.
+ *
+ * Copyright 1988, Student Information Processing Board of the
+ * Massachusetts Institute of Technology.
+ *
+ * For copyright and distribution info, see the documentation supplied
+ * with this package.
+ */
 
-#ifdef __SABER__
-void com_err(char *, int, char *, ...);
-char *error_message(int);
-void perror(char *);
-/* too painful to do right.  someday... */
-int (*com_err_hook)();
-int (*set_com_err_hook())();
-int (*reset_com_err_hook())();
+#ifndef __COM_ERR_H
+
+#ifdef __STDC__
+#ifndef __HIGHC__              /* gives us STDC but not stdarg */
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+/* ANSI C -- use prototypes etc */
+void com_err (const char *, long, const char *, ...);
+char const *error_message (long);
+void (*com_err_hook) (const char *, long, const char *, va_list);
+void (*set_com_err_hook (void (*) (const char *, long, const char *, va_list)))
+    (const char *, long, const char *, va_list);
+void (*reset_com_err_hook ()) (const char *, long, const char *, va_list);
 #else
-void com_err();
-char *error_message();
-void perror();
-int (*com_err_hook)();
-int (*set_com_err_hook())();
-int (*reset_com_err_hook())();
-#endif /* __SABER__ */
+/* no prototypes */
+void com_err ();
+char *error_message ();
+void (*com_err_hook) ();
+void (*set_com_err_hook ()) ();
+void (*reset_com_err_hook ()) ();
+
+#define const
+#endif
+
+#define __COM_ERR_H
+#endif /* ! defined(__COM_ERR_H) */