r40: made c++ compatible

diff --git a/include/cio.h b/include/cio.h
index a96a67f744856f21f6b180ddb45cabca8bbcd6f0..7057bd43d055064528b2e364f55f2e1d7961728a 100644 (file)
--- a/include/cio.h
+++ b/include/cio.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: cio.h,v 1.4 2000/04/28 18:18:59 kevin Exp $
+**  $Id: cio.h,v 1.5 2000/05/07 12:46:19 kevin Exp $
 **  $Log: cio.h,v $
+**  Revision 1.5  2000/05/07 12:46:19  kevin
+**  made c++ compatible
+**
 **  Revision 1.4  2000/04/28 18:18:59  kevin
 **  removed unused files
 **
@@ -27,6 +30,11 @@
 #ifndef __CIO_H
 #define __CIO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
 struct crtv_st {
     int init;          /* True if initialized */
     int bios_mode;     /* Current BIOS crt mode */
@@ -46,34 +54,6 @@ struct crtv_st {
 #define CRT_ROWS  25
 #define CRT_COLS  80
 
-/* crt modes */
-
-#define GM_TEXT40    1     /* color */
-#define GM_TEXT80    3     /* color */
-#define GM_320x200   4     /* color */
-#define GM_640x200   6
-#define GM_MONOTEXT  7
-#define GM_E320x200 13
-#define GM_E640x200 14
-#define GM_MONOGRF  15
-#define GM_ENHANCED 16
-
-#define GM_640x480x16  0x12
-#define GM_640x480x256 0x2E
-#define GM_1024x768x16 0x37
-#define GM_1024x768x256        0x38
-
-
-
-#define GM_TEXT             -1
-#define GM_HIGHRES   -2
-#define GM_MEDRES    -3
-
-#define CRT_NONE    -1
-#define CRT_MONO     0
-#define CRT_COLOR    1
-#define CRT_ENHANCED 2
-
 /*----------------------------------------------------------------------*/
 
 #define  ATTR_NORMAL     7
@@ -105,13 +85,6 @@ struct crtv_st {
 #define SC_TAB           9
 #define SC_BLANK       ' '
 
-#define SC_TOP_LEFT    218
-#define SC_TOP_RIGHT   191
-#define SC_BOTT_LEFT   192
-#define SC_BOTT_RIGHT  217
-#define SC_HORIZ       196
-#define SC_VERTICAL    179
-
 
 #define WAITKEY()      {cio_kb_clr(); while (cio_kb_read() == 0);}
 
@@ -173,4 +146,8 @@ void cio_tone(double freq, double length);
 /* check_kb */
 int cio_check_kb_escape(void);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif

diff --git a/include/ezplot.h b/include/ezplot.h
index 26a4c34c09ae15e4bdfb94633c6df8233c2c4d76..988c0534e5d02a3d04f7e801c6fda61c8c25405a 100644 (file)
--- a/include/ezplot.h
+++ b/include/ezplot.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ezplot.h,v 1.2 2000/04/28 14:14:16 kevin Exp $
+**  $Id: ezplot.h,v 1.3 2000/05/07 12:46:19 kevin Exp $
 **  $Log: ezplot.h,v $
+**  Revision 1.3  2000/05/07 12:46:19  kevin
+**  made c++ compatible
+**
 **  Revision 1.2  2000/04/28 14:14:16  kevin
 **  *** empty log message ***
 **
@@ -29,6 +32,11 @@
 #ifndef __H_EZPLOT
 #define __H_EZPLOT
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
 #include <stdio.h>
 #include <stddef.h>
 #include "kstddef.h"
@@ -331,4 +339,9 @@ int ezset(char *command);
 /* makefmt.c */
 void make_numfmt(char *fmtstr, int *fldwid, int *nfrac, double min, double max, int nint);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
 #endif

diff --git a/include/ir.h b/include/ir.h
index 5a0b7291412afdd97914bfe0c1b1ca105525d8a7..fbab3fc5d4d7450f52eafb5589166697f33d2fb5 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.11 2000/05/05 02:37:31 kevin Exp $
+**  $Id: ir.h,v 1.12 2000/05/07 12:46:19 kevin Exp $
 **  $Log: ir.h,v $
+**  Revision 1.12  2000/05/07 12:46:19  kevin
+**  made c++ compatible
+**
 **  Revision 1.11  2000/05/05 02:37:31  kevin
 **  renamed phmelm to pelm
 **
@@ -63,6 +66,10 @@
 #ifndef IR_H
 #define IR_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #ifdef MPI_CT
 #define MPI_MAX_PROCESS 128
 struct mpi_ct_st
@@ -500,4 +507,8 @@ int detarray_read(RAYSUM *rs, DETARRAY *darray, const int view_num);
 int detarray_write(RAYSUM *rs, const DETARRAY *darray, const int view_num);
 int raysum_print(const RAYSUM *rs);
 
+#ifdef __cplusplus
+} 
+#endif /* __cplusplus */
+
 #endif

diff --git a/include/kmath.h b/include/kmath.h
index 2a8145422162a0e1cf584a5ff29ed474872a91e5..e250a06d40e9a482a75501a6f3c54743e91383b1 100644 (file)
--- a/include/kmath.h
+++ b/include/kmath.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: kmath.h,v 1.7 2000/05/04 18:16:34 kevin Exp $
+**  $Id: kmath.h,v 1.8 2000/05/07 12:46:19 kevin Exp $
 **  $Log: kmath.h,v $
+**  Revision 1.8  2000/05/07 12:46:19  kevin
+**  made c++ compatible
+**
 **  Revision 1.7  2000/05/04 18:16:34  kevin
 **  renamed filter definitions
 **
@@ -47,6 +50,10 @@
 #include <stdio.h>
 #include <math.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 #define PI      3.14159265358979323846
 #define HALFPI  1.57079632679489661923 /* PI divided by 2 */
 #define QUARTPI 0.78539816339744830962 /* PI divided by 4 */
@@ -219,7 +226,8 @@ void rotate2d(double x[], double y[], int pts, double angle);
 void xlat2d(double x[], double y[], int pts, double xoffset, double yoffset);
 void scale2d(double x[], double y[], int pts, double xfact, double yfact);
 
-
-
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif

diff --git a/include/kstddef.h b/include/kstddef.h
index 5634ef9862be74f2be521f27e95803feb6b5408d..4a5771c267cf3c180afd8f4062d8facce562941e 100644 (file)
--- a/include/kstddef.h
+++ b/include/kstddef.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: kstddef.h,v 1.6 2000/05/03 19:51:41 kevin Exp $
+**  $Id: kstddef.h,v 1.7 2000/05/07 12:46:19 kevin Exp $
 **  $Log: kstddef.h,v $
+**  Revision 1.7  2000/05/07 12:46:19  kevin
+**  made c++ compatible
+**
 **  Revision 1.6  2000/05/03 19:51:41  kevin
 **  function renaming for phantoms and phantom elements
 **
@@ -52,6 +55,11 @@
 #ifndef STDDEF_H
 #define STDDEF_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -233,4 +241,8 @@ char *td_str_cdate(DATE *d);
 char *td_month_name(int n);
 char *td_day_name(int n);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif

diff --git a/include/pol.h b/include/pol.h
index b7a484b9135406e3c07320b2fc30339d5eee8b66..2d8932440dc04fd7129fd79ceb0b15262ccd12fc 100644 (file)
--- a/include/pol.h
+++ b/include/pol.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: pol.h,v 1.2 2000/04/28 14:14:16 kevin Exp $
+**  $Id: pol.h,v 1.3 2000/05/07 12:46:19 kevin Exp $
 **  $Log: pol.h,v $
+**  Revision 1.3  2000/05/07 12:46:19  kevin
+**  made c++ compatible
+**
 **  Revision 1.2  2000/04/28 14:14:16  kevin
 **  *** empty log message ***
 **
@@ -24,6 +27,10 @@
 #ifndef __H_POL
 #define __H_POL
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /* codes for pol_usefile */
 
 #define P_USE_STR  1           /* use string as input source */
@@ -112,4 +119,8 @@ void pol_ungetch(int c);
 int get_inputline(FILE *fp);
 void set_inputline(char *line);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif

diff --git a/include/sdf.h b/include/sdf.h
index be1c7932d857ce503191f84be8988ef4023d051e..a1585506602cf05c1c056386bb44d8c9f26dba17 100644 (file)
--- a/include/sdf.h
+++ b/include/sdf.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sdf.h,v 1.2 2000/04/28 14:14:16 kevin Exp $
+**  $Id: sdf.h,v 1.3 2000/05/07 12:46:19 kevin Exp $
 **  $Log: sdf.h,v $
+**  Revision 1.3  2000/05/07 12:46:19  kevin
+**  made c++ compatible
+**
 **  Revision 1.2  2000/04/28 14:14:16  kevin
 **  *** empty log message ***
 **
@@ -34,6 +37,9 @@
 
 #include "kmath.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /*----------------*/
 /* SYSTEM ALIASES */
@@ -338,4 +344,8 @@ char *sdf_2d_alloc_row(const int nrow, SDF_2D *imp);
 char *sdf_2d_alloc_col(const int ncol, SDF_2D *imp);
 void sdf_2d_error(const SDF_2D *imp, const char *str, ...);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif

diff --git a/include/sgp.h b/include/sgp.h
index e6a93059659bb6c4b0ee00d07649b9ace2977438..fc878ec8a04e4837b71117a12f0cc12b14e6e1e6 100644 (file)
--- a/include/sgp.h
+++ b/include/sgp.h
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sgp.h,v 1.4 2000/04/30 19:17:35 kevin Exp $
+**  $Id: sgp.h,v 1.5 2000/05/07 12:46:19 kevin Exp $
 **  $Log: sgp.h,v $
+**  Revision 1.5  2000/05/07 12:46:19  kevin
+**  made c++ compatible
+**
 **  Revision 1.4  2000/04/30 19:17:35  kevin
 **  Set up include files for conditional INTERACTIVE_GRAPHICS
 **
@@ -37,6 +40,11 @@
 #include "kstddef.h"
 #include "kmath.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
 /* device names */
 
 #define CRTDEV  1
@@ -267,5 +275,9 @@ void wrtchar(int ch, int x, int y, CHARSPEC *cspec, DEVICE *dev);
 void wrttext(char txtstr[], int x, int y, CHARSPEC *cspec, DEVICE *dev);
 void crtcolor(int mode, int *f, int *b);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 
 #endif