diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2002-06-03 09:35:25 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2002-06-03 09:35:25 +0000 |
| commit | 6d544b03900fd8dc869b2129d6dab3457e039150 (patch) | |
| tree | 4b11ba3cad0c5fc48524cd57449b8ef598960e6b /lib/make/cctk_Config.h.in | |
| parent | bb0262ab862f53ca8f4d6a3d10437245177e3e72 (diff) | |
Moved the defines for 'const', 'inline', and 'restrict' down into the
'#ifdef CCODE' section so that they aren't seen anymore by Fortran code.
This should fix Cactus/1079.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2889 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/cctk_Config.h.in')
| -rw-r--r-- | lib/make/cctk_Config.h.in | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/lib/make/cctk_Config.h.in b/lib/make/cctk_Config.h.in index 423fff78..d79acbf3 100644 --- a/lib/make/cctk_Config.h.in +++ b/lib/make/cctk_Config.h.in @@ -1,20 +1,6 @@ #ifndef _CCTK_CONFIG_H_ #define _CCTK_CONFIG_H_ -/* These are definitely there in C++ */ -#ifndef __cplusplus - -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline - -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define to empty if the keyword does not work. */ -#undef restrict - -#endif /* ! defined __cplusplus */ - /* Define if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN @@ -175,6 +161,19 @@ typedef enum {false, true} bool; #endif /* __cplusplus */ +/* These are definitely there in C++ */ +#ifndef __cplusplus + +/* Define as __inline if that's what the C compiler calls it. */ +#undef inline + +/* Define to empty if the keyword does not work. */ +#undef const + +/* Define to empty if the keyword does not work. */ +#undef restrict + +#endif /* ! defined __cplusplus */ #endif /*CCODE */ |