** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ct.h,v 1.7 2000/06/07 00:59:38 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
**
#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>
#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"
using namespace std;
#include "array2d.h"
- #include "idf.h"
+ #include "imagefile.h"
#endif
+#include "ir.h"
+
#endif