All include files for thorns now have cctk_ then a capital letter (!)

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

8 files changed, 13 insertions, 14 deletions

diff --git a/src/include/cGH.h b/src/include/cGH.h
index ce2cfa07..6ba8fa4a 100644
--- a/src/include/cGH.h
+++ b/src/include/cGH.h
@@ -12,7 +12,7 @@
 #define _CGH_H_
 
 #ifndef _CCTK_TYPES_H
-#include "cctk_types.h"
+#include "cctk_Types.h"
 #endif
 
 typedef struct
diff --git a/src/include/cctk.h b/src/include/cctk.h
index 98743218..b2695da9 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -13,7 +13,7 @@
 
 /* Grab the main configuration info. */
 
-#include "cctk_config.h"
+#include "cctk_Config.h"
 
 /* Define which thorn the file is in */
 
@@ -21,7 +21,7 @@
 
 /* Include the constants */
 
-#include "cctk_constants.h"
+#include "cctk_Constants.h"
 
 /* Define some stuff */
 
@@ -81,6 +81,7 @@
 #include "cctk_ActiveThorns.h"
 #include "cctk_Banner.h"
 #include "cctk_Cache.h"
+#include "cctk_Complex.h"
 #include "cctk_Coord.h"
 #include "cctk_File.h"
 #include "cctk_Groups.h"
@@ -103,7 +104,7 @@
 
 #define _DECLARE_CCTK_CARGUMENTS \
             void      *cctk_dummy_pointer;\
-            int        cctk_dummy_int;\
+            CCTK_INT   cctk_dummy_int;\
             CCTK_REAL  cctk_dummy_real;\
             int        cctk_dim=cctkGH->cctk_dim;\
             int       *cctk_gsh=cctkGH->cctk_gsh;\
diff --git a/src/include/cctk_complex.h b/src/include/cctk_Complex.h
index d81d8871..d8307b85 100644
--- a/src/include/cctk_complex.h
+++ b/src/include/cctk_Complex.h
@@ -1,15 +1,15 @@
  /*@@
-   @header    cctk_complex.h
+   @header    cctk_Complex.h
    @date      Tue Dec 14 12:28:05 1999
    @author    Tom Goodale
    @desc 
-   Routines for complex numbers.
+   Prototypes for complex numbers.
    @enddesc 
    @version $Header$
  @@*/
 
-#ifndef __CCTK_COMPLEX_H_
-#define __CCTK_COMPLEX_H_
+#ifndef _CCTK_COMPLEX_H_
+#define _CCTK_COMPLEX_H_
 
 #ifdef __cplusplus 
 extern "C" 
diff --git a/src/include/cctk_constants.h b/src/include/cctk_Constants.h
index fd6208e4..2087b8dc 100644
--- a/src/include/cctk_constants.h
+++ b/src/include/cctk_Constants.h
@@ -1,5 +1,5 @@
  /*@@
-   @header    cctk_constants.h
+   @header    cctk_Constants.h
    @date      Fri Oct 15 21:29:23 CEST 1999
    @author    Gabrielle Allen
    @desc 
diff --git a/src/include/cctk_Flesh.h b/src/include/cctk_Flesh.h
index ff59fa69..7f1b2bc7 100644
--- a/src/include/cctk_Flesh.h
+++ b/src/include/cctk_Flesh.h
@@ -9,7 +9,6 @@
  @@*/
 
 #include "CactusTimers.h"
-#include "cctk.h"
 #include "cGH.h"
 
 
@@ -18,7 +17,6 @@
 
 /*  Typedefs */
 
-
 typedef struct
 {
   char *parameter_file_name;
diff --git a/src/include/cctk_schedule.h b/src/include/cctk_Schedule.h
index 4f8cffad..4f8cffad 100644
--- a/src/include/cctk_schedule.h
+++ b/src/include/cctk_Schedule.h
diff --git a/src/include/cctk_types.h b/src/include/cctk_Types.h
index 37101324..5bc203f7 100644
--- a/src/include/cctk_types.h
+++ b/src/include/cctk_Types.h
@@ -4,7 +4,7 @@
    @author    Tom Goodale
    @desc 
    Defines the appropriate types based upon the precision.
-   Should be included by cctk_config.h .
+   Should be included by cctk_Config.h .
    @enddesc 
  @@*/
 
@@ -15,7 +15,7 @@
  * this by hand.
  */
 #ifndef _CCTK_CONFIG_H_
-#include "cctk_config.h"
+#include "cctk_Config.h"
 #endif
 
 /* Define stuff for C. */
diff --git a/src/include/cctki_schedule.h b/src/include/cctki_Schedule.h
index b709807c..52f8210f 100644
--- a/src/include/cctki_schedule.h
+++ b/src/include/cctki_Schedule.h
@@ -1,5 +1,5 @@
  /*@@
-   @header    cctki_schedule.h
+   @header    cctki_Schedule.h
    @date      Wed Sep 15 22:49:24 1999
    @author    Tom Goodale
    @desc