diff options
| author | Richard A. Kirian <rkirian@asu.edu> | 2012-01-29 06:58:13 -0800 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2012-02-22 15:27:45 +0100 |
| commit | 57a04749684d8969b263320ac9cc380d67b40795 (patch) | |
| tree | d2a0a23f16b8e9b2571ea3c3c63cc0f331f8bf75 /libcrystfel | |
| parent | 83a67ef5a39abbebe1b5a6f470403aa9b57e046e (diff) | |
Attempt to make some headers compatible with c++
Diffstat (limited to 'libcrystfel')
| -rw-r--r-- | libcrystfel/src/detector.h | 6 | ||||
| -rw-r--r-- | libcrystfel/src/geometry.h | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h index dd5dccec..0bffd043 100644 --- a/libcrystfel/src/detector.h +++ b/libcrystfel/src/detector.h @@ -23,6 +23,9 @@ struct hdfile; #include "hdf5-file.h" #include "image.h" +#ifdef __cplusplus +extern "C" { +#endif struct panel { @@ -127,5 +130,8 @@ extern double smallest_q(struct image *image); extern struct panel *find_panel_by_name(struct detector *det, const char *name); +#ifdef __cplusplus +} +#endif #endif /* DETECTOR_H */ diff --git a/libcrystfel/src/geometry.h b/libcrystfel/src/geometry.h index 6115baa1..943a95b0 100644 --- a/libcrystfel/src/geometry.h +++ b/libcrystfel/src/geometry.h @@ -20,8 +20,16 @@ #include "reflist.h" #include "cell.h" -extern RefList *find_intersections(struct image *image, UnitCell *cell); +#ifdef __cplusplus +extern "C" { +#endif + +RefList *find_intersections(struct image *image, UnitCell *cell); -extern void update_partialities(struct image *image); +void update_partialities(struct image *image); + +#ifdef __cplusplus +} +#endif #endif /* GEOMETRY_H */ |