summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsbrandt <sbrandt@17b73243-c579-4c4c-a9d2-2d5706c11dac>2012-06-18 17:48:27 +0000
committersbrandt <sbrandt@17b73243-c579-4c4c-a9d2-2d5706c11dac>2012-06-18 17:48:27 +0000
commit0d07ac21bf7db6765b83ea1bc88f9f4f05d63af7 (patch)
tree4a411cf054e16707d91836e64c7cb666085689b3 /src
parent47a6b6f908ad8f4607cb8e7830d8159522ce0947 (diff)
Changes for ticket #768
Change per thorn -DTHORN_IS_xxx to a per thorn -I bindings/include/xxx git-svn-id: http://svn.cactuscode.org/flesh/trunk@4839 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src')
-rw-r--r--src/include/cctk_core.h (renamed from src/include/cctk.h)7
-rw-r--r--src/main/CactusDefaultEvolve.c2
-rw-r--r--src/main/SetupCache.c2
-rw-r--r--src/main/ShutdownCactus.c2
4 files changed, 8 insertions, 5 deletions
diff --git a/src/include/cctk.h b/src/include/cctk_core.h
index f47c0a39..7620e823 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk_core.h
@@ -9,8 +9,8 @@
@version $Header$
@@*/
-#ifndef _CCTK_H_
-#define _CCTK_H_ 1
+#ifndef _CCTK_CORE_H_
+#define _CCTK_CORE_H_ 1
/* Grab the main configuration info. */
#include "cctk_Config.h"
@@ -30,9 +30,6 @@
#include "cctk_Loop.h"
#include "cctk_WarnLevel.h"
-/* Include definitions provided by capabilities */
-#include "cctk_Capabilities.h"
-
#define CCTK_PRINTSEPARATOR\
print '("--------------------------------------------------------------------------------")'
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index 72bbeaa3..9bb64cf8 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -13,6 +13,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include "definethisthorn.h"
+
#include "cctk_Flesh.h"
#include "cctk_Parameters.h"
#include "cctk_Groups.h"
diff --git a/src/main/SetupCache.c b/src/main/SetupCache.c
index 71ffa217..6700cd71 100644
--- a/src/main/SetupCache.c
+++ b/src/main/SetupCache.c
@@ -8,6 +8,8 @@
@version $Id$
@@*/
+#include "definethisthorn.h"
+
#include "cctk_Config.h"
#include "cctk_Flesh.h"
#include "cctk_Parameters.h"
diff --git a/src/main/ShutdownCactus.c b/src/main/ShutdownCactus.c
index 63fb720d..1e61224c 100644
--- a/src/main/ShutdownCactus.c
+++ b/src/main/ShutdownCactus.c
@@ -8,6 +8,8 @@
@version $Id$
@@*/
+#include "definethisthorn.h"
+
#include <stdio.h>
#include <stdlib.h>