sync'ing files for RCS->CVS migration

[moira.git] / util / makedepend / main.c

diff --git a/util/makedepend/main.c b/util/makedepend/main.c
index e7e5da4c62af07a5d2aa61c5ad3a762256c4823f..34e776589091eed3838d34282e4c8fa82a38dd19 100644 (file)
--- a/util/makedepend/main.c
+++ b/util/makedepend/main.c
@@ -36,6 +36,9 @@ struct symtab predefs[] = {
 #endif
 #ifdef sun
        {"sun", NULL},
+#ifdef sparc
+       {"sparc", NULL},
+#endif
 #endif
 #ifdef hpux
        {"hpux", NULL},
@@ -45,6 +48,15 @@ struct symtab        predefs[] = {
 #endif
 #ifdef VMS
        {"VMS", NULL},
+#endif
+#ifdef ultrix
+       {"ultrix", NULL},
+#endif
+#ifdef mips
+       {"mips", NULL},
+#endif
+#ifdef _AIX
+       {"_AIX", NULL},
 #endif
        {NULL, NULL}
 };
@@ -62,15 +74,15 @@ int width = 78;
 boolean        printed = FALSE;
 boolean        verbose = FALSE;
 boolean        show_where_not = FALSE;
-#if defined (mips) && defined (SYSTYPE_SYSV)
-void  catch();
-#else /* !(mips && SYSTYPE_SYSV) */
-#ifdef ultrix
-void  catch();
+
+#if defined(POSIX) || (defined(mips) && defined(SYSTYPE_SYSV))
+typedef void sigreturn_t;
 #else
-int   catch();
+typedef int sigreturn_t;
 #endif
+sigreturn_t catch();
 
+#if !(defined(mips) && defined(SYSTYPE_SYSV))
 struct sigvec sig_vec = {
        catch,
         (1<<(SIGINT -1))
@@ -277,6 +289,7 @@ freefile(fp)
 
 /*VARARGS*/
 log_fatal(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9)
+char *x0, *x1, *x2, *x3, *x4, *x5, *x6, *x7, *x8, *x9;
 {
        log(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9);
        exit (1);
@@ -284,6 +297,7 @@ log_fatal(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9)
 
 /*VARARGS0*/
 log(x0,x1,x2,x3,x4,x5,x6,x7,x8,x9)
+char *x0, *x1, *x2, *x3, *x4, *x5, *x6, *x7, *x8, *x9;
 {
        fprintf(stderr, x0,x1,x2,x3,x4,x5,x6,x7,x8,x9);
 }