r68: Added C++ compatibility

[ctsim.git] / include / ir.h

diff --git a/include/ir.h b/include/ir.h
index 652e5cb5b746fb79eb7694499cf0379663c44f6c..3cc918a6da7d3f226217716ad8049a7ed9ed6db1 100644 (file)
--- a/include/ir.h
+++ b/include/ir.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ir.h,v 1.17 2000/06/03 06:29:08 kevin Exp $
+**  $Id: ir.h,v 1.18 2000/06/05 01:32:45 kevin Exp $
 **  $Log: ir.h,v $
+**  Revision 1.18  2000/06/05 01:32:45  kevin
+**  Added C++ compatibility
+**
 **  Revision 1.17  2000/06/03 06:29:08  kevin
 **  *** empty log message ***
 **
@@ -276,13 +279,16 @@ typedef enum {
 } FunctionSymmetry;
 
 /* interpolation methods */
+#undef HAVE_BSPLINE_INTERP
 typedef enum {     /* Interpolation methods */
   I_NEAREST,       /* Nearest neighbor */
-  I_LINEAR,        /* Linear interpolation */
+#if HAVE_BSPLINE_INTERP
   I_BSPLINE,
   I_1BSPLINE,      /* 1st order B-Spline */
   I_2BSPLINE,
-  I_3BSPLINE
+  I_3BSPLINE,
+#endif
+  I_LINEAR        /* Linear interpolation */
 } InterpolationType;
 
 /* Constants for sizing PHANTOM */