Remove the need for -Wno-pointer-sign. Object diffs checked.

[bsdgames-darwin.git] / trek / systemname.c

diff --git a/trek/systemname.c b/trek/systemname.c
index 74ca7774c3e067bf12af138b70d1515dd878c7b7..0eabec2438612410248c713e1e39ddd547ea55c4 100644 (file)
--- a/trek/systemname.c
+++ b/trek/systemname.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: systemname.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $   */
+/*     $NetBSD: systemname.c,v 1.9 2009/05/25 00:05:56 dholland Exp $  */

 
 /*
  * Copyright (c) 1980, 1993
 
 /*
  * Copyright (c) 1980, 1993


@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors

  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -38,11 +34,12 @@
 #if 0
 static char sccsid[] = "@(#)systemname.c       8.1 (Berkeley) 5/31/93";
 #else
 #if 0
 static char sccsid[] = "@(#)systemname.c       8.1 (Berkeley) 5/31/93";
 #else

-__RCSID("$NetBSD: systemname.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
+__RCSID("$NetBSD: systemname.c,v 1.9 2009/05/25 00:05:56 dholland Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 

-# include      "trek.h"
+#include <stddef.h>
+#include "trek.h"

 
 /*
 **  RETRIEVE THE STARSYSTEM NAME
 
 /*
 **  RETRIEVE THE STARSYSTEM NAME


@@ -55,8 +52,8 @@ __RCSID("$NetBSD: systemname.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
 **     starsystems, etc.
 */
 
 **     starsystems, etc.
 */
 

-const char *systemname(q1)
-       const struct quad       *q1;
+const char *
+systemname(const struct quad *q1)

 {
        const struct quad       *q;
        int             i;
 {
        const struct quad       *q;
        int             i;


@@ -69,6 +66,6 @@ const char *systemname(q1)
 
        i &= Q_SYSTEM;
        if (i == 0)
 
        i &= Q_SYSTEM;
        if (i == 0)

-               return (0);
+               return NULL;

        return (Systemname[i]);
 }
        return (Systemname[i]);
 }