Fix build with clang

5 files changed, 117 insertions, 3 deletions

diff --git a/math/calctool/files/patch-display.c b/math/calctool/files/patch-display.c
new file mode 100644
index 00000000000..9e59e7cb0fb
--- /dev/null
+++ b/math/calctool/files/patch-display.c
@@ -0,0 +1,10 @@
+--- ./display.c.orig	1990-02-02 03:02:53.000000000 +0100
++++ ./display.c	2012-08-24 12:52:07.093913492 +0200
+@@ -269,6 +269,7 @@
+ }
+ 
+ 
++void
+ process_item(n)
+ int n ;
+ {
diff --git a/math/calctool/files/patch-functions.c b/math/calctool/files/patch-functions.c
new file mode 100644
index 00000000000..c1b21b5e5fe
--- /dev/null
+++ b/math/calctool/files/patch-functions.c
@@ -0,0 +1,26 @@
+--- ./functions.c.orig	1993-06-02 19:13:52.000000000 +0200
++++ ./functions.c	2012-08-24 12:53:33.505914506 +0200
+@@ -233,6 +233,7 @@
+ }
+ 
+ 
++void
+ do_help()         /* Show online help facility. */
+ {
+   char help_str[MAXLINE], nextline[MAXLINE], *p ;
+@@ -333,6 +334,7 @@
+ }
+ 
+ 
++void
+ do_number()
+ {
+   int n ;
+@@ -371,6 +373,7 @@
+ }
+ 
+ 
++void
+ do_pending()
+ {
+   if (base != DEC) grey_buttons(DEC) ;    /* Reshow all the keys. */
diff --git a/math/calctool/files/patch-get.c b/math/calctool/files/patch-get.c
new file mode 100644
index 00000000000..9f0a2903643
--- /dev/null
+++ b/math/calctool/files/patch-get.c
@@ -0,0 +1,26 @@
+--- ./get.c.orig	1990-02-16 00:28:39.000000000 +0100
++++ ./get.c	2012-08-24 12:54:31.377915039 +0200
+@@ -157,6 +157,7 @@
+ }
+ 
+ 
++void
+ get_helpfile(helpname)     /* Open helpfile if present. */
+ char *helpname ;
+ {
+@@ -188,6 +189,7 @@
+ }
+ 
+ 
++void
+ get_rcfile(name)          /* Read .calctoolrc file. */
+ char *name ;
+ {
+@@ -281,6 +283,7 @@
+ }
+ 
+ 
++void
+ read_rcfiles()   /* Read .calctoolrc's from home and current directories. */
+ {
+   char *home ;            /* Pathname for users home directory. */
diff --git a/math/calctool/files/patch-graphics.c b/math/calctool/files/patch-graphics.c
new file mode 100644
index 00000000000..fff4080e66e
--- /dev/null
+++ b/math/calctool/files/patch-graphics.c
@@ -0,0 +1,44 @@
+--- ./graphics.c.orig	1990-02-02 03:02:42.000000000 +0100
++++ ./graphics.c	2012-08-24 12:51:05.209915967 +0200
+@@ -20,7 +20,9 @@
+ #include "color.h"
+ #include "extern.h"
+ 
++void make_registers();
+ 
++void
+ but_text(row, column, portion, state)
+ int row, column, portion ;
+ enum but_state state ;
+@@ -116,6 +118,7 @@
+ }
+ 
+ 
++void
+ grey_buttons(base)     /* Grey out numeric buttons depending upon base. */
+ enum base_type base ;
+ {
+@@ -142,6 +145,7 @@
+ }
+ 
+ 
++void
+ handle_down_event(type)
+ int type ;
+ {
+@@ -263,6 +267,7 @@
+ }
+ 
+ 
++void
+ make_registers()           /* Calculate memory register frame values. */
+ {
+   char line[MAXLINE] ;     /* Current memory register line. */
+@@ -279,6 +284,7 @@
+ }
+ 
+ 
++void
+ process_event(type)       /* Process this event. */
+ int type ;
+ {
diff --git a/math/calctool/files/patch-tty.c b/math/calctool/files/patch-tty.c
index 54c9920a8c9..3ca66993a29 100644
--- a/math/calctool/files/patch-tty.c
+++ b/math/calctool/files/patch-tty.c
@@ -1,5 +1,5 @@
---- tty.c.orig	2008-06-14 18:05:30.000000000 +0400
-+++ tty.c	2008-06-14 18:08:25.000000000 +0400
+--- ./tty.c.orig	1990-02-06 05:47:47.000000000 +0100
++++ ./tty.c	2012-08-24 12:55:15.782915559 +0200
 @@ -18,6 +18,7 @@
  #include <stdio.h>
  #include <strings.h>
@@ -26,7 +26,15 @@
    exit(0) ;
  }
  
-@@ -315,11 +316,14 @@
+@@ -128,6 +129,7 @@
+ }
+ 
+ 
++void
+ drawline(x1, y1, x2, y2)
+ int x1, y1, x2, y2 ;
+ {
+@@ -315,11 +317,14 @@
  
    SIGNAL(SIGINT, cleanup) ;