r87: Upgraded from MPI to MPI++

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index 4d4ba757b4c90c745d20e39129eefe397073978e..d43353de489df62088cc859d477eb50d5846c714 100644 (file)
--- a/include/ct.h
+++ b/include/ct.h
@@ -2,8 +2,23 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ct.h,v 1.6 2000/05/24 22:48:17 kevin Exp $
+**  $Id: ct.h,v 1.11 2000/06/07 10:12:09 kevin Exp $
 **  $Log: ct.h,v $
+**  Revision 1.11  2000/06/07 10:12:09  kevin
+**  Upgraded from MPI to MPI++
+**
+**  Revision 1.10  2000/06/07 07:43:39  kevin
+**  *** empty log message ***
+**
+**  Revision 1.9  2000/06/07 03:49:54  kevin
+**  *** empty log message ***
+**
+**  Revision 1.8  2000/06/07 02:30:27  kevin
+**  Added C++ image files
+**
+**  Revision 1.7  2000/06/07 00:59:38  kevin
+**  added imagefiles
+**
 **  Revision 1.6  2000/05/24 22:48:17  kevin
 **  First functional version of SDF library for X-window
 **
@@ -41,26 +56,38 @@
 #define CT_H
 
 #ifdef _WIN32
-typedef long off_t;
-#define HAVE_STRING_H 1
-#include <fcntl.h>
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
+  typedef long off_t;
+  #define HAVE_STRING_H 1
+  #include <fcntl.h>
+  #define snprintf _snprintf
+  #define vsnprintf _vsnprintf
+  #define strcasecmp stricmp
+  #define strncasecmp strnicmp
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+  #include <config.h>
 #endif
 #ifdef HAVE_PNG
-#include "png.h"
+  #include "png.h"
 #endif
 #ifdef HAVE_G2_H
-#include "g2.h"
-#ifdef HAVE_X11
-#include "g2_X11.h"
-#endif
+  #ifdef __cplusplus
+  extern "C" { 
+    #include "g2.h" 
+  }
+  #else
+  #include "g2.h"
+  #endif
+  #ifdef HAVE_X11
+    #ifdef __cplusplus
+      extern "C" {
+        #include "g2_X11.h"
+      }
+    #else
+        #include "g2_X11.h"
+    #endif
+  #endif
 #endif
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -117,20 +144,31 @@ typedef long off_t;
 #include <stdint.h>             /* Standard ints on Linux */
 #endif
 
-#ifdef MPI_CT
-#include "mpi.h"
+#ifdef HAVE_MPI
+#include "mpi++.h"
 #endif
 
 #include "kstddef.h"
 #include "kmath.h"
-#include "sdf.h"
-#include "ir.h"
 #include "keyboard.h"
 #include "cio.h"
+
 #ifdef HAVE_SGP
-#include "ezplot.h"
-#include "sgp.h"
+  #include "ezplot.h"
+  #include "sgp.h"
+#endif
+
+#ifdef __cplusplus
+  #include <iostream>
+  #include <string>
+
+  using namespace std;
+
+  #include "array2d.h"
+  #include "imagefile.h"
 #endif
 
+#include "ir.h"
+
 #endif