Patches for fbtest

[Jon Smirl <jonsmirl@yahoo.com>]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

This patch fixes the syntax in fbtest so that gcc 3.2
is happy. I also adjusted the libs for the current
version of libnetpbm.

I went searching for libnetpnm which doesn't seem to
exist standalone any more. It is part of libnetpbm
now.





=====
Jon Smirl
jonsmirl@yahoo.com

__________________________________________________
Do you Yahoo!?
Yahoo! Mail Plus - Powerful. Affordable. Sign up now.
http://mailplus.yahoo.com

[-- Attachment #2: gcc3.2 --]
[-- Type: application/octet-stream, Size: 4714 bytes --]

Index: color.c
===================================================================
RCS file: /cvsroot/linux-fbdev/fbtest/color.c,v
retrieving revision 1.4
diff -u -r1.4 color.c
--- color.c	31 May 2001 11:04:54 -0000	1.4
+++ color.c	1 Dec 2002 21:54:24 -0000
@@ -11,6 +11,7 @@
 
 #include "types.h"
 #include "color.h"
+#include <stdlib.h>
 
 
     /*
Index: main.c
===================================================================
RCS file: /cvsroot/linux-fbdev/fbtest/main.c,v
retrieving revision 1.6
diff -u -r1.6 main.c
--- main.c	5 Oct 2002 15:28:15 -0000	1.6
+++ main.c	1 Dec 2002 21:54:24 -0000
@@ -11,6 +11,8 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "types.h"
 #include "util.h"
Index: tests.c
===================================================================
RCS file: /cvsroot/linux-fbdev/fbtest/tests.c,v
retrieving revision 1.9
diff -u -r1.9 tests.c
--- tests.c	3 Nov 2002 21:00:34 -0000	1.9
+++ tests.c	1 Dec 2002 21:54:24 -0000
@@ -10,6 +10,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include "types.h"
 #include "fb.h"
Index: util.c
===================================================================
RCS file: /cvsroot/linux-fbdev/fbtest/util.c,v
retrieving revision 1.4
diff -u -r1.4 util.c
--- util.c	9 May 2001 20:21:33 -0000	1.4
+++ util.c	1 Dec 2002 21:54:25 -0000
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 #include "types.h"
 #include "fb.h"
Index: drawops/init.c
===================================================================
RCS file: /cvsroot/linux-fbdev/fbtest/drawops/init.c,v
retrieving revision 1.7
diff -u -r1.7 init.c
--- drawops/init.c	27 Nov 2002 22:56:29 -0000	1.7
+++ drawops/init.c	1 Dec 2002 21:54:25 -0000
@@ -43,8 +43,8 @@
      */
 
 #define PRESENT_OR_SET_GENERIC(op)		\
-    if (!drawops. ## op)			\
-	drawops. ## op = generic_ ## op;
+    if (!drawops.op)                            \
+	drawops.op = generic_##op;
 
 int drawops_init(void)
 {
Index: pnmtohex/Makefile
===================================================================
RCS file: /cvsroot/linux-fbdev/fbtest/pnmtohex/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- pnmtohex/Makefile	8 Aug 2002 18:18:55 -0000	1.2
+++ pnmtohex/Makefile	1 Dec 2002 21:54:25 -0000
@@ -3,7 +3,7 @@
 
 TARGET = pnmtohex
 
-LIBS += -lnetpnm -lnetpbm -lnetpgm -lnetppm
+LIBS += -lnetpbm 
 
 include $(TOPDIR)/Rules.make
 
Index: tests/test010.c
===================================================================
RCS file: /cvsroot/linux-fbdev/fbtest/tests/test010.c,v
retrieving revision 1.2
diff -u -r1.2 test010.c
--- tests/test010.c	10 Nov 2002 21:29:29 -0000	1.2
+++ tests/test010.c	1 Dec 2002 21:54:25 -0000
@@ -23,45 +23,45 @@
 {
     con_init(&sun12x22);
     con_puts("Hello, world!\n");
-    con_puts("
-
-/*
- *  Test010
- *
- *  (C) Copyright 2002 Geert Uytterhoeven
- *
- *  This file is subject to the terms and conditions of the GNU General Public
- *  License. See the file COPYING in the main directory of this archive for
- *  more details.
- */
-
-#include <unistd.h>
-
-#include \"types.h\"
-#include \"font.h\"
-#include \"console.h\"
-#include \"visual.h\"
-#include \"test.h\"
-#include \"util.h\"
-
-
-static enum test_res test010_func(void)
-{
-    con_init(&sun12x22);
-    con_puts(\"Hello, world!\\n\");
-    wait_for_key(10);
-    return TEST_OK;
-}
-
-const struct test test010 = {
-    .name =             \"test010\",
-    .desc =             \"Hello world\",
-    .visual =           VISUAL_PSEUDOCOLOR,
-    .reqs =             REQF_num_colors,
-    .num_colors =       16,
-    .func =             test010_func,
-};
-
+    con_puts("\n\
+\n\
+/*\n\
+ *  Test010\n\
+ *\n\
+ *  (C) Copyright 2002 Geert Uytterhoeven\n\
+ *\n\
+ *  This file is subject to the terms and conditions of the GNU General Public\n\
+ *  License. See the file COPYING in the main directory of this archive for\n\
+ *  more details.\n\
+ */\n\
+\n\
+#include <unistd.h>\n\
+\n\
+#include \"types.h\"\n\
+#include \"font.h\"\n\
+#include \"console.h\"\n\
+#include \"visual.h\"\n\
+#include \"test.h\"\n\
+#include \"util.h\"\n\
+\n\
+\n\
+static enum test_res test010_func(void)\n\
+{\n\
+    con_init(&sun12x22);\n\
+    con_puts(\"Hello, world!\\n\");\n\
+    wait_for_key(10);\n\
+    return TEST_OK;\n\
+}\n\
+\n\
+const struct test test010 = {\n\
+    .name =             \"test010\",\n\
+    .desc =             \"Hello world\",\n\
+    .visual =           VISUAL_PSEUDOCOLOR,\n\
+    .reqs =             REQF_num_colors,\n\
+    .num_colors =       16,\n\
+    .func =             test010_func,\n\
+};\n\
+\n\
 ");
     wait_for_key(10);
     return TEST_OK;