Fixing various warnings.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1596 17b73243-c579-4c4c-a9d2-2d5706c11dac

8 files changed, 18 insertions, 16 deletions

diff --git a/src/IO/OverloadIO.c b/src/IO/OverloadIO.c
index 233417c1..0071a66f 100644
--- a/src/IO/OverloadIO.c
+++ b/src/IO/OverloadIO.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 
 #include "cctk_Flesh.h"
 #include "OverloadMacros.h"
diff --git a/src/comm/OverloadComm.c b/src/comm/OverloadComm.c
index 112abe22..9a62a3e6 100644
--- a/src/comm/OverloadComm.c
+++ b/src/comm/OverloadComm.c
@@ -12,6 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
 
 #include "cctk_Flesh.h"
 #include "cctk_FortranString.h"
diff --git a/src/include/RegisterKeyedFunction.h b/src/include/RegisterKeyedFunction.h
index 5be1fdde..fddecb2d 100644
--- a/src/include/RegisterKeyedFunction.h
+++ b/src/include/RegisterKeyedFunction.h
@@ -9,20 +9,21 @@
  @@*/
 
 #ifndef _REGISTERKEYEDFUNCTION_H_
-#define _REGISTERKEYEDFUNCTION_H_
+#define _REGISTERKEYEDFUNCTION_H_ 1
 
 /*****************************************************/
 /* Function prototypes. */
 
 #ifdef __cplusplus
-extern "C" {
+extern "C" 
+{
 #endif
 
-int RegisterKeyedFunction(void (*array[])(), 
+int RegisterKeyedFunction(void (*array[])(void), 
                           int min, int max, 
-                          int key, void (*func)());
+                          int key, void (*func)(void));
 
-void  (**(CreateKeyedFunctionArray(int size)))();
+void  (**(CreateKeyedFunctionArray(int size)))(void);
 
 #ifdef __cplusplus
 }
diff --git a/src/main/Coord.c b/src/main/Coord.c
index df7ec733..70082a52 100644
--- a/src/main/Coord.c
+++ b/src/main/Coord.c
@@ -11,6 +11,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "cctk_Flesh.h"
 #include "cctk_Coord.h"
diff --git a/src/main/InitialiseDataStructures.c b/src/main/InitialiseDataStructures.c
index 604875cd..465d0a23 100644
--- a/src/main/InitialiseDataStructures.c
+++ b/src/main/InitialiseDataStructures.c
@@ -16,9 +16,6 @@
 #include "cctki_ActiveThorns.h"
 #include "cctki_Cache.h"
 
-/* FIXME - remove this when ActiveThorns doesn't need it */
-#include "SKBinTree.h"
-
 static char *rcsid = "$Header$";
 
 CCTK_FILEVERSION(main_InitialiseDataStructures_c)
diff --git a/src/main/OverloadMain.c b/src/main/OverloadMain.c
index 93947882..e1dcd7d6 100644
--- a/src/main/OverloadMain.c
+++ b/src/main/OverloadMain.c
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "cctk_Flesh.h"
 #include "cctk_WarnLevel.h"
diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index 899ad860..3d90f2d8 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-
+#include <string.h>
 
 #include "cctk_Flesh.h"
 #include "cctk_WarnLevel.h"
diff --git a/src/util/RegisterKeyedFunction.c b/src/util/RegisterKeyedFunction.c
index 62667c3e..2059a6be 100644
--- a/src/util/RegisterKeyedFunction.c
+++ b/src/util/RegisterKeyedFunction.c
@@ -29,9 +29,9 @@ CCTK_FILEVERSION(util_RegisterKeyedFunction_c)
    @endhistory 
 
 @@*/
-int RegisterKeyedFunction(void (*array[])(), 
+int RegisterKeyedFunction(void (*array[])(void), 
                           int min, int max, 
-                          int key, void (*func)())
+                          int key, void (*func)(void))
 {
   int return_code;
 
@@ -74,13 +74,13 @@ int RegisterKeyedFunction(void (*array[])(),
    @endhistory 
 
 @@*/
-void  (**(CreateKeyedFunctionArray(int size)))()
+void  (**(CreateKeyedFunctionArray(int size)))(void)
 {
-  void (**array)();
+  void (**array)(void);
   int i;
 
   /* Allocate the memory. */
-  array = (void (**)())malloc(size*sizeof(void (*)()));
+  array = (void (**)(void))malloc(size*sizeof(void (*)(void)));
 
   if(array)
   {
@@ -98,9 +98,9 @@ void  (**(CreateKeyedFunctionArray(int size)))()
 
 #ifdef TEST_KEYED_FUNCTIONS
 
-static void (**functions)();
+static void (**functions)(void);
 
-void RegisterTestFunction(int key, void (*func)())
+void RegisterTestFunction(int key, void (*func)(void))
 {
   int retcode;
   if((retcode = RegisterKeyedFunction(functions, 0, 2, key, func)) == 1)