Merge pull request mtoyoda#16 from jeffs/master

Fix compiler warnings, and have Git ignore build product.
shuike · Jun 16, 2014 · 0fd8d6f · 0fd8d6f
2 parents e4c01af + 7d3a25b
commit 0fd8d6f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/sl
diff --git a/sl.c b/sl.c
@@ -1,11 +1,13 @@
 /*========================================
- *    sl.c: SL version 5.01
+ *    sl.c: SL version 5.02
  *        Copyright 1993,1998,2014
  *                  Toyoda Masashi
  *                  (mtoyoda@acm.org)
- *        Last Modified: 2014/03/31
+ *        Last Modified: 2014/06/03
  *========================================
  */
+/* sl version 5.02 : Fix compiler warnings.                                  */
+/*                                              by Jeff Schwab    2014/06/03 */
 /* sl version 5.01 : removed cursor and handling of IO                       */
 /*                                              by Chris Seymour  2014/01/03 */
 /* sl version 5.00 : add -c option                                           */
@@ -39,6 +41,14 @@
 #include <unistd.h>
 #include "sl.h"
 
+void add_smoke(int y, int x);
+void add_man(int y, int x);
+int add_C51(int x);
+int add_D51(int x);
+int add_sl(int x);
+void option(char *str);
+int my_mvaddstr(int y, int x, char *str);
+
 int ACCIDENT  = 0;
 int LOGO      = 0;
 int FLY       = 0;
@@ -145,7 +155,7 @@ int add_sl(int x)
 }
 
 
-add_D51(int x)
+int add_D51(int x)
 {
     static char *d51[D51PATTERNS][D51HIGHT + 1]
         = {{D51STR1, D51STR2, D51STR3, D51STR4, D51STR5, D51STR6, D51STR7,
@@ -185,7 +195,7 @@ add_D51(int x)
     return OK;
 }
 
-add_C51(int x)
+int add_C51(int x)
 {
     static char *c51[C51PATTERNS][C51HIGHT + 1]
         = {{C51STR1, C51STR2, C51STR3, C51STR4, C51STR5, C51STR6, C51STR7,
@@ -226,7 +236,7 @@ add_C51(int x)
 }
 
 
-int add_man(int y, int x)
+void add_man(int y, int x)
 {
     static char *man[2][2] = {{"", "(O)"}, {"Help!", "\\O/"}};
     int i;
@@ -237,7 +247,7 @@ int add_man(int y, int x)
 }
 
 
-int add_smoke(int y, int x)
+void add_smoke(int y, int x)
 #define SMOKEPTNS        16
 {
     static struct smokes {

diff --git a/sl.h b/sl.h
@@ -1,9 +1,9 @@
 /*========================================
- *    sl.h: SL version 5.1
+ *    sl.h: SL version 5.02
  *	Copyright 1993,2002,2014
  *                Toyoda Masashi
  *		  (mtoyoda@acm.org)
- *	Last Modified: 2014/03/31
+ *	Last Modified: 2014/06/03
  *========================================
  */