diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-09-28 14:07:55 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-09-28 14:07:55 -0500 |
| commit | d6bb37747366c18a08c35fc27911868230d71734 (patch) | |
| tree | 5971297000cce5b0f548294d0e5a1f5c74519138 /Carpet/CarpetIOASCII | |
| parent | 847e05386e2b9ff0ea74e2bdd648bd043520ae55 (diff) | |
| parent | e3973dfc2e0e90d9b0f2482243b4cd652cc9f4d2 (diff) | |
Merge branch 'master' of /Users/eschnett/Cbeta/carpet/
Conflicts:
Carpet/CarpetIOASCII/src/ioascii.hh
Diffstat (limited to 'Carpet/CarpetIOASCII')
| -rw-r--r-- | Carpet/CarpetIOASCII/src/ioascii.hh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Carpet/CarpetIOASCII/src/ioascii.hh b/Carpet/CarpetIOASCII/src/ioascii.hh index 7906acf73..9713689b9 100644 --- a/Carpet/CarpetIOASCII/src/ioascii.hh +++ b/Carpet/CarpetIOASCII/src/ioascii.hh @@ -4,6 +4,7 @@ #include <vector> #include <cctk.h> +#include <cctk_Arguments.h> @@ -15,7 +16,7 @@ namespace CarpetIOASCII { // Scheduled functions extern "C" { - int CarpetIOASCIIStartup (); + int CarpetIOASCIIStartup (void); void CarpetIOASCIIInit (CCTK_ARGUMENTS); } |