r109: reorganized header files

diff --git a/include/Makefile.am b/include/Makefile.am
index 64baad3552f3127265930040b08db97bf4ecc07f..0b7826d023f61f197551643374311870d3d449f0 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
-noinst_HEADERS=ascii.h cio.h ct.h ezplot.h keyboard.h kmath.h kstddef.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h byteorder.h phantom.h timer.h sstream scanner.h projections.h
+noinst_HEADERS=ct.h ezplot.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h byteorder.h phantom.h timer.h sstream scanner.h projections.h ctsupport.h
 
 
 

diff --git a/include/array2d.h b/include/array2d.h
index c4d42007b50bdc38a08f1fb48d46ea94649ebc7a..5eb23b3804b3e66424399ff806f99672da05cc71 100644 (file)
--- a/include/array2d.h
+++ b/include/array2d.h
@@ -9,8 +9,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: array2d.h,v 1.4 2000/06/09 11:03:08 kevin Exp $
+**  $Id: array2d.h,v 1.5 2000/06/19 19:04:05 kevin Exp $
 **  $Log: array2d.h,v $
+**  Revision 1.5  2000/06/19 19:04:05  kevin
+**  reorganized header files
+**
 **  Revision 1.4  2000/06/09 11:03:08  kevin
 **  Made ImageFile inherit from Array2dFile
 **
@@ -35,7 +38,8 @@
 #ifndef ARRAY2D_H
 #define ARRAY2D_H
 
-#include <kstddef.h>
+#include "ctsupport.h"
+
 
 template<class T> 
 class Array2d {

diff --git a/include/ascii.h b/include/ascii.h
deleted file mode 100644 (file)
index f74fe1c..0000000
--- a/include/ascii.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: ascii.h,v 1.2 2000/04/28 14:14:16 kevin Exp $
-**  $Log: ascii.h,v $
-**  Revision 1.2  2000/04/28 14:14:16  kevin
-**  *** empty log message ***
-**
-**
-**  This program is free software; you can redistribute it and/or modify
-**  it under the terms of the GNU General Public License (version 2) as
-**  published by the Free Software Foundation.
-**
-**  This program is distributed in the hope that it will be useful,
-**  but WITHOUT ANY WARRANTY; without even the implied warranty of
-**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**  GNU General Public License for more details.
-**
-**  You should have received a copy of the GNU General Public License
-**  along with this program; if not, write to the Free Software
-**  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-******************************************************************************/
-/******************************************************************************
- *
- * FILE IDENTIFICATION
- *
- *     File Name:      ASCII.H
- *     Author:         Kevin Rosenberg
- *     Purpose:        Header file with definitions for ASCII characrers
- *      Date Started:  Jan 84
- *
- * DESCRIPTION
- *     Header file contains values for ASCII characters
- *
- * MODIFICATION LOG
- *
- *****************************************************************************/
-
-#ifndef ASCII_H
-#define ASCII_H
-
-#define BACKSPACE  8
-#define LF     0x0A
-#define CR     0x0D
-#define BELL   0x07
-
-#define SQUOTE    '\''
-#define DQUOTE    '\"'
-#define BSLASH    '\\'
-#define BACKSLASH '\\'
-#define SHARP     '#'
-#define SLASH     '/'
-#define ASTERICK  '*'
-#define COLON    ':'
-#define LBRACE    '{'
-#define RBRACE    '}'
-#define LPAREN   '('
-#define RPAREN    ')'
-#define LBRACK   '['
-#define RBRACK   ']'
-#define LANBRACK  '<'
-#define RANBRACK  '>'
-#define SEMICOL   ';'
-#define UNDERLIN  '_'
-#define COMMA    ','
-#define CARET    '^'
-#define TILDE    '~'
-#define ATSIGN   '@'
-#define AMPERSAND  '&'
-#define EXCLAM   '!'
-#define DOLLAR   '$'
-#define PERCENT   '%'
-#define PLUS     '+'
-#define HYPHEN   '-'
-#define EQUALS   '='
-#define QUESTION  '?'
-#define PERIOD   '.'
-#define VERTBAR   '|'
-
-#endif /* #ifndef ASCII_H */

diff --git a/include/ct.h b/include/ct.h
index c3ec83db749253da9212f8028fb08363a360bc0b..016a4f89e7ceddf7ab3eaeb771c3b7808ae64922 100644 (file)
--- a/include/ct.h
+++ b/include/ct.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ct.h,v 1.18 2000/06/19 17:58:20 kevin Exp $
+**  $Id: ct.h,v 1.19 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -114,10 +114,7 @@ extern "C" {
 #include "mpiworld.h"
 #endif
 
-#include "kstddef.h"
-#include "kmath.h"
-#include "keyboard.h"
-#include "cio.h"
+#include "ctsupport.h"
 #include "byteorder.h"
 
 #ifdef HAVE_SGP

diff --git a/include/ctsupport.h b/include/ctsupport.h
index 708d1610dc48d49ffbc2ba81c6067ea803b41058..349aaf5db270a704d64d8aac7c9cfc483953a5bc 100644 (file)
--- a/include/ctsupport.h
+++ b/include/ctsupport.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsupport.h,v 1.1 2000/06/19 18:49:00 kevin Exp $
+**  $Id: ctsupport.h,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -319,4 +319,44 @@ unsigned int cio_kb_waitc(const char *astr, int beep);
 #define KEY_RETURN     13
 #define KEY_ESCAPE     27
 
-#endif
+// ASCII Section
+
+#define BACKSPACE  8
+#define LF     0x0A
+#define CR     0x0D
+#define BELL   0x07
+
+#define SQUOTE    '\''
+#define DQUOTE    '\"'
+#define BSLASH    '\\'
+#define BACKSLASH '\\'
+#define SHARP     '#'
+#define SLASH     '/'
+#define ASTERICK  '*'
+#define COLON    ':'
+#define LBRACE    '{'
+#define RBRACE    '}'
+#define LPAREN   '('
+#define RPAREN    ')'
+#define LBRACK   '['
+#define RBRACK   ']'
+#define LANBRACK  '<'
+#define RANBRACK  '>'
+#define SEMICOL   ';'
+#define UNDERLIN  '_'
+#define COMMA    ','
+#define CARET    '^'
+#define TILDE    '~'
+#define ATSIGN   '@'
+#define AMPERSAND  '&'
+#define EXCLAM   '!'
+#define DOLLAR   '$'
+#define PERCENT   '%'
+#define PLUS     '+'
+#define HYPHEN   '-'
+#define EQUALS   '='
+#define QUESTION  '?'
+#define PERIOD   '.'
+#define VERTBAR   '|'
+
+#endif /* #ifndef ASCII_H */

diff --git a/include/ezplot.h b/include/ezplot.h
index 4beb8ff58c2f6c19a45ebf86f8275eae06424ce0..40e05f47e7abb4c3df34763cfe1eed69e0527335 100644 (file)
--- a/include/ezplot.h
+++ b/include/ezplot.h
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ezplot.h,v 1.6 2000/06/18 10:27:11 kevin Exp $
+**  $Id: ezplot.h,v 1.7 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -29,12 +29,10 @@
 
 #include <stdio.h>
 #include <stddef.h>
-#include "kstddef.h"
 #include <ctype.h>
-#include "sgp.h"
 #include <math.h>
-#include "kmath.h"
-#include "cio.h"
+#include "ctsupport.h"
+#include "sgp.h"
 
 #define MAXLABEL  40           /* maximum length of axis label */
 #define MAXTITLE  40           /* maximum length of a title */

diff --git a/include/imagefile.h b/include/imagefile.h
index ccf376905fe670c38a1233c52cbdb10e2260db25..5d362199adea76daaa027f631a49386de1b60d09 100644 (file)
--- a/include/imagefile.h
+++ b/include/imagefile.h
@@ -2,13 +2,14 @@
 #define IDF_H
 
 #include <string>
-#include "kstddef.h"
 #include <sys/types.h>
 #include <unistd.h>
-#include <array2d.h>
+#include "ctsupport.h"
+#include "array2d.h"
 
 using namespace std;
 
+
 class Array2dFileLabel
 {
 private:

diff --git a/include/sgp.h b/include/sgp.h
index ee95681a6a2ede5f5835ddf4a270d24f5eb1a8ca..15f0c35a567c3e7ccd20a80d115b2a13ccca458d 100644 (file)
--- a/include/sgp.h
+++ b/include/sgp.h
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sgp.h,v 1.9 2000/06/15 19:07:10 kevin Exp $
+**  $Id: sgp.h,v 1.10 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -25,13 +25,12 @@
 #ifndef __H_SGP
 #define __H_SGP
 
-#include "kstddef.h"
-#include "kmath.h"
-
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "ctsupport.h"
+
 #if HAVE_G2_H
 extern "C" {
 #include "g2.h"

diff --git a/libctgraphics/circle.cpp b/libctgraphics/circle.cpp
index 373edae463bacb178d98ec8cb9739655c9b5238a..5c74deeb7a0016dc6a095309de3f796900b854ed 100644 (file)
--- a/libctgraphics/circle.cpp
+++ b/libctgraphics/circle.cpp
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: circle.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
+**  $Id: circle.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **  $Log: circle.cpp,v $
+**  Revision 1.2  2000/06/19 19:04:05  kevin
+**  reorganized header files
+**
 **  Revision 1.1  2000/06/19 18:05:03  kevin
 **  initial cvs import
 **
@@ -37,7 +40,7 @@
  */
 
 #include "math.h"
-#include "kmath.h"
+#include "ctsupport.h"
 #include "sgp.h"
 
 void 

diff --git a/libctgraphics/ctm.cpp b/libctgraphics/ctm.cpp
index 4f88c772debeb81cff0a07d28bdf75105e69bef4..ec61c29c62366f9204e00866b9d36fca1914643f 100644 (file)
--- a/libctgraphics/ctm.cpp
+++ b/libctgraphics/ctm.cpp
@@ -2,21 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctm.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
-**  $Log: ctm.cpp,v $
-**  Revision 1.1  2000/06/19 18:05:03  kevin
-**  initial cvs import
-**
-**  Revision 1.1  2000/06/13 16:20:31  kevin
-**  finished c++ conversions
-**
-**  Revision 1.2  2000/05/11 14:07:23  kevin
-**  Fixed compilation warnings
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
-**
-**
+**  $Id: ctm.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -54,9 +40,8 @@
  *     column
  *---------------------------------------------------------------------------*/
 
-#include "kstddef.h"
+#include "ctsupport.h"
 #include <math.h>
-#include "kmath.h"
 #include "sgp.h"
 
 

diff --git a/libctgraphics/drawbox.cpp b/libctgraphics/drawbox.cpp
index 9d9eff6807a950226b310c9027efd172f2cc2fa5..f0bc8992027845692474f93e774e7fe489e2191f 100644 (file)
--- a/libctgraphics/drawbox.cpp
+++ b/libctgraphics/drawbox.cpp
@@ -2,24 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: drawbox.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
-**  $Log: drawbox.cpp,v $
-**  Revision 1.1  2000/06/19 18:05:03  kevin
-**  initial cvs import
-**
-**  Revision 1.1  2000/06/13 16:20:31  kevin
-**  finished c++ conversions
-**
-**  Revision 1.3  2000/05/24 22:49:01  kevin
-**  Updated SGP: first function X-windows version
-**
-**  Revision 1.2  2000/05/11 14:07:23  kevin
-**  Fixed compilation warnings
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
-**
-**
+**  $Id: drawbox.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as

diff --git a/libctgraphics/driver_x11.cpp b/libctgraphics/driver_x11.cpp
index c48a4d27fbdf412cab76f0a775533422576f5524..7992ee60b36ffecbaf629dc69080d6b8e8fa48d7 100644 (file)
--- a/libctgraphics/driver_x11.cpp
+++ b/libctgraphics/driver_x11.cpp
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: driver_x11.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
+**  $Id: driver_x11.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **  $Log: driver_x11.cpp,v $
+**  Revision 1.2  2000/06/19 19:04:05  kevin
+**  reorganized header files
+**
 **  Revision 1.1  2000/06/19 18:05:03  kevin
 **  initial cvs import
 **
@@ -28,10 +31,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "kstddef.h"
+#include "ctsupport.h"
 #include "sgp.h"
-#include "kmath.h"
-#include "cio.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

diff --git a/libctgraphics/ezplot.cpp b/libctgraphics/ezplot.cpp
index 73db34d6a4d34efb80e169c5fd636d24ce74eaf0..dfd0baf900807c4f76cf798ddd2d1b0203bd3058 100644 (file)
--- a/libctgraphics/ezplot.cpp
+++ b/libctgraphics/ezplot.cpp
@@ -1,8 +1,12 @@
 /*****************************************************************************
+** FILE IDENTIFICATION
+**
+**    EZPLOT                                   
+**
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ezplot.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
+**  $Id: ezplot.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -17,18 +21,15 @@
 **  along with this program; if not, write to the Free Software
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
-/*----------------------------------------------------------------------*/
-/*                             EZPLOT                                  */
-/*----------------------------------------------------------------------*/
 
 #include "ezplot.h"
 #include "algo.h"
 
+
 static int plot (SGP_ID *gid);
 static void drawaxis(void);
 static void symbol (int sym, double symwidth, double symheight);
 
-
 /*-------------------------------------*/
 /* GLOBAL variables for EZPLOT & EZSET */
 /*-------------------------------------*/

diff --git a/libctgraphics/ezpol.cpp b/libctgraphics/ezpol.cpp
index 54932f38f96185ff3758b3a0eff7a11fdee62c63..ff079911a90945b69edad080ad9ee15cc745c4b1 100644 (file)
--- a/libctgraphics/ezpol.cpp
+++ b/libctgraphics/ezpol.cpp
@@ -1,8 +1,12 @@
 /*****************************************************************************
+** FILE IDENTIFICATION
+**
+**   POL - Problem Oriented Language                   
+**
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ezpol.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
+**  $Id: ezpol.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -17,22 +21,20 @@
 **  along with this program; if not, write to the Free Software
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
-/*----------------------------------------------------------------------*/
-/*                     POL - Problem Oriented Language                 */
 /*                                                                     */
 /*----------------------------------------------------------------------*/
 
 #include <math.h>
-#include "ascii.h"
-#include "stdio.h"
-#include "kstddef.h"
-#include "ctype.h"
+#include <stdio.h>
+#include <ctype.h>
+#include "ctsupport.h"
 #include "pol.h"
 
-#define HASHSIZE 20
 
-/* Tables words stored with install() & found with lookup() */
+static const int HASHSIZE=20;
+
 
+/* Tables words stored with install() & found with lookup() */
 static SYMBOL *skiptable[HASHSIZE];            /* words to ignore and skip */
 static SYMBOL *cmdtable[HASHSIZE];             /* pol parameter commands */
 static SYMBOL *usertable[HASHSIZE];            /* user defined symbols */

diff --git a/libctgraphics/ezset.cpp b/libctgraphics/ezset.cpp
index b850f56c2f17db0eec2bb58363b2de009442bcc4..1bc08c8c252f5f0a305b2dc7351f2d4afacc25cf 100644 (file)
--- a/libctgraphics/ezset.cpp
+++ b/libctgraphics/ezset.cpp
@@ -1,8 +1,12 @@
 /*****************************************************************************
+**  FILE IDENTIFICATION
+**
+**      EZSET - Parameter control for EZPLOT           
+**
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ezset.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
+**  $Id: ezset.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -18,13 +22,12 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 /*----------------------------------------------------------------------*/
-/*                     EZSET - Parameter control for EZPLOT            */
 /*                                                                     */
 /*----------------------------------------------------------------------*/
 
+#include "ctsupport.h"
 #include "ezplot.h"
 #include "pol.h"
-#include "cio.h"
 
 static int ezcmd (char *comm);
 static int do_cmd(int lx);

diff --git a/libctgraphics/ezsupport.cpp b/libctgraphics/ezsupport.cpp
index 51f97423d7f92a0489eb489f4a73c1311e3a0e06..89457870060724f13cad342ca59e34c9c218682f 100644 (file)
--- a/libctgraphics/ezsupport.cpp
+++ b/libctgraphics/ezsupport.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ezsupport.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
+**  $Id: ezsupport.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -20,7 +20,7 @@
 
 #include <math.h>
 #include <algorithm>
-#include "kstddef.h"
+#include "ctsupport.h"
 #include "ezplot.h"
 
 

diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp
index e3241a8e8e3dc129e057ae6e42d649360ef00a24..55d3c0e151188e3bc26b0f66b3536be8fe28a003 100644 (file)
--- a/libctgraphics/sgp.cpp
+++ b/libctgraphics/sgp.cpp
@@ -1,28 +1,13 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: sgp.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
-**  $Log: sgp.cpp,v $
-**  Revision 1.1  2000/06/19 18:05:03  kevin
-**  initial cvs import
-**
-**  Revision 1.1  2000/06/13 16:20:31  kevin
-**  finished c++ conversions
-**
-**  Revision 1.4  2000/05/24 22:49:01  kevin
-**  Updated SGP: first function X-windows version
-**
-**  Revision 1.3  2000/05/11 14:07:23  kevin
-**  Fixed compilation warnings
-**
-**  Revision 1.2  2000/05/08 20:08:15  kevin
-**  *** empty log message ***
+** FILE IDENTIFICATION
 **
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
+**     Name:       sgp.c               Simple Graphics Package
+**     Programmer: Kevin Rosenberg
 **
+**  This is part of the CTSim program
+**  Copyright (C) 1983-2000 Kevin Rosenberg
 **
+**  $Id: sgp.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -38,19 +23,12 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-/*-----------------------------------------------------------------------------
- * FILE IDENTIFICATION
- *
- *     Name:       sgp.c               Simple Graphics Package
- *     Programmer: Kevin Rosenberg
- *
- *---------------------------------------------------------------------------*/
-
-#include "stdio.h"
-#include "kstddef.h"
-#include "math.h"
-#include "kmath.h"
+#include <stdio.h>
+#include <math.h>
+#include "ctsupport.h"
 #include "sgp.h"
+
+
 static SGP_ID _sgp2_cwin = NULL;
 
 extern CHARSPEC cspec;

diff --git a/libctgraphics/sgpdrive.cpp b/libctgraphics/sgpdrive.cpp
index fad8475dad8e2526ae629b91d2d1da58706304d3..09445badc703b866372b34f929be0c1ff18a2361 100644 (file)
--- a/libctgraphics/sgpdrive.cpp
+++ b/libctgraphics/sgpdrive.cpp
@@ -2,42 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sgpdrive.cpp,v 1.2 2000/06/19 18:44:51 kevin Exp $
-**  $Log: sgpdrive.cpp,v $
-**  Revision 1.2  2000/06/19 18:44:51  kevin
-**  *** empty log message ***
-**
-**  Revision 1.1  2000/06/19 18:05:03  kevin
-**  initial cvs import
-**
-**  Revision 1.2  2000/06/15 19:07:10  kevin
-**  *** empty log message ***
-**
-**  Revision 1.1  2000/06/13 16:20:31  kevin
-**  finished c++ conversions
-**
-**  Revision 1.7  2000/06/03 06:29:22  kevin
-**  Finished g2 conditional compilation
-**
-**  Revision 1.6  2000/05/24 22:49:01  kevin
-**  Updated SGP: first function X-windows version
-**
-**  Revision 1.5  2000/05/11 14:07:23  kevin
-**  Fixed compilation warnings
-**
-**  Revision 1.4  2000/05/08 20:08:15  kevin
-**  *** empty log message ***
-**
-**  Revision 1.3  2000/04/28 18:35:23  kevin
-**  removed unused files
-**
-**  Revision 1.2  2000/04/28 13:50:45  kevin
-**  Removed Makefile Makefile.in that are automatically generated by autoconf
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
-**
-**
+**  $Id: sgpdrive.cpp,v 1.3 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -52,15 +17,15 @@
 **  along with this program; if not, write to the Free Software
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
+
 /* Device Driver for IBM PC Kevin Rosenberg  March 84 */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include "kstddef.h"
+#include "ctsupport.h"
 #include "sgp.h"
-#include "kmath.h"
-#include "cio.h"
+
 
 static int init_prt(void);
 static void term_prt(void);

diff --git a/libctgraphics/sgptext.cpp b/libctgraphics/sgptext.cpp
index a4cb1a3b133f63707dbb9b54504eb564854bc1cf..9657a07850d7752b0b5a7939ccd0ff88634613ce 100644 (file)
--- a/libctgraphics/sgptext.cpp
+++ b/libctgraphics/sgptext.cpp
@@ -2,21 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sgptext.cpp,v 1.1 2000/06/19 18:05:03 kevin Exp $
-**  $Log: sgptext.cpp,v $
-**  Revision 1.1  2000/06/19 18:05:03  kevin
-**  initial cvs import
-**
-**  Revision 1.1  2000/06/13 16:20:31  kevin
-**  finished c++ conversions
-**
-**  Revision 1.2  2000/04/28 18:35:23  kevin
-**  removed unused files
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
-**
-**
+**  $Id: sgptext.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -31,14 +17,14 @@
 **  along with this program; if not, write to the Free Software
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
+
 /* FILE
  *   sgptext.c                         Text routines for graphics package
  */
 
-#include "kstddef.h"
-#include "sgp.h"
 #include <stdio.h>
-#include "cio.h"
+#include "ctsupport.h"
+#include "sgp.h"
 
 
 /* Pixel patterns of marker symbols (1x1 to 5x5 matrix) */

diff --git a/libctsupport/audio.cpp b/libctsupport/audio.cpp
index ad46a6de6e5a6287cf565bfddfb63cdfbe634649..2def9d201a77831c9e23e560dab9f45ab28fd25d 100644 (file)
--- a/libctsupport/audio.cpp
+++ b/libctsupport/audio.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: audio.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
+**  $Id: audio.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -25,7 +25,7 @@
  *    beep()
  */
 
-#include "cio.h"
+#include "ctsupport.h"
 
 void cio_beep (void)
 {
@@ -41,9 +41,6 @@ void cio_beep (void)
  *    double length    duration to play note in seconds
  */
 
-#include <stdio.h>
-#include "cio.h"
-
 void 
 cio_tone (double freq, double length)
 {

diff --git a/libctsupport/byteorder.cpp b/libctsupport/byteorder.cpp
index f7734fa44a32d86a2bb7e83fa42afbe2865f26b6..6a2ddc96f1f466e14c32dd4edd0121fab19f4321 100644 (file)
--- a/libctsupport/byteorder.cpp
+++ b/libctsupport/byteorder.cpp
@@ -6,9 +6,10 @@
 #include <unistd.h>
 #endif
 
-#include "kstddef.h"
+#include "ctsupport.h"
 #include "byteorder.h"
 
+
 inline void
 SwapBytes2 (void* buffer)
 {

diff --git a/libctsupport/clip.cpp b/libctsupport/clip.cpp
index 4aa6f019a50291392e874af8efce63aff1e1fba6..9c2abbc79a069ce6ecf07f1a5e928436b0cc10bc 100644 (file)
--- a/libctsupport/clip.cpp
+++ b/libctsupport/clip.cpp
@@ -14,7 +14,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: clip.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
+**  $Id: clip.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -30,8 +30,7 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#include "kstddef.h"
-#include "kmath.h"
+#include "ctsupport.h"
 
 
 /* NAME

diff --git a/libctsupport/consoleio.cpp b/libctsupport/consoleio.cpp
index 93d31600fa9405c8b8e00d47798384fea4eba5c1..bc6df45616097ad93b83514dff67dec8e4750006 100644 (file)
--- a/libctsupport/consoleio.cpp
+++ b/libctsupport/consoleio.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: consoleio.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
+**  $Id: consoleio.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -20,10 +20,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "cio.h"
-#include "kstddef.h"
-#include "cio.h"
-
+#include "ctsupport.h"
 
 
 /* NAME

diff --git a/libctsupport/filefuncs.cpp b/libctsupport/filefuncs.cpp
index 100960ac8d81b4fcf2d409e4bac054401cdbad81..511251d3261f45bb45c1a7793498e988fb8b1870 100644 (file)
--- a/libctsupport/filefuncs.cpp
+++ b/libctsupport/filefuncs.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: filefuncs.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
+**  $Id: filefuncs.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
 **  Initial CVS import for first public release
@@ -26,9 +26,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <iostream>
-#include "kstddef.h"
-#include "cio.h"
-
+#include "ctsupport.h"
 
 
 const char* 

diff --git a/libctsupport/normangle.cpp b/libctsupport/normangle.cpp
index b04ee93fc4e8ca8ef374620b9e8d6a804720801f..12638018fac01da3877b933d40568822a0c83970 100644 (file)
--- a/libctsupport/normangle.cpp
+++ b/libctsupport/normangle.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: normangle.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
+**  $Id: normangle.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -18,7 +18,7 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#include "kmath.h"
+#include "ctsupport.h"
 
 
 /* NAME

diff --git a/libctsupport/simpson.cpp b/libctsupport/simpson.cpp
index 234e062fa472d50337090eb3fa6b9195cf135b0c..e7a52706152d855b96f9d36b5be2ce5d11bb86bf 100644 (file)
--- a/libctsupport/simpson.cpp
+++ b/libctsupport/simpson.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: simpson.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
+**  $Id: simpson.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -18,7 +18,7 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#include "kmath.h"
+#include "ctsupport.h"
 
 
 /* NAME

diff --git a/libctsupport/strfuncs.cpp b/libctsupport/strfuncs.cpp
index 21dabb5728c96bdc3f4b4ea3323452e7b5ae12f5..414faea91ddd541dce972495867418359e163aac 100644 (file)
--- a/libctsupport/strfuncs.cpp
+++ b/libctsupport/strfuncs.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: strfuncs.cpp,v 1.2 2000/06/19 18:16:44 kevin Exp $
+**  $Id: strfuncs.cpp,v 1.3 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -19,7 +19,7 @@
 ******************************************************************************/
 
 #include <ctype.h>
-#include "kstddef.h"
+#include "ctsupport.h"
 
 
 /* NAME

diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp
index b5981b1c16fd7f5928706370516c7a5701dab844..28ccba42036ba329b4626c54fe1e8fa76112f907 100644 (file)
--- a/libctsupport/syserror.cpp
+++ b/libctsupport/syserror.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: syserror.cpp,v 1.2 2000/06/19 17:58:20 kevin Exp $
+**  $Id: syserror.cpp,v 1.3 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -23,8 +23,7 @@
 #include <stdexcept>
 #include <stdarg.h>
 #include <ctype.h>
-#include "kstddef.h"
-#include "cio.h"
+#include "ctsupport.h"
 
 
 /* NAME

diff --git a/libctsupport/timedate.cpp b/libctsupport/timedate.cpp
index 0b920e0210e43cad34a8a266c1e24ed686ca22bb..458066f9ddada8c492acf75d670502191da72a92 100644 (file)
--- a/libctsupport/timedate.cpp
+++ b/libctsupport/timedate.cpp
@@ -2,30 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: timedate.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
-**  $Log: timedate.cpp,v $
-**  Revision 1.1  2000/06/19 02:58:08  kevin
-**  *** empty log message ***
-**
-**  Revision 1.1  2000/06/13 16:20:31  kevin
-**  finished c++ conversions
-**
-**  Revision 1.5  2000/06/05 01:33:11  kevin
-**  *** empty log message ***
-**
-**  Revision 1.4  2000/05/11 01:05:51  kevin
-**  Changed sprintf to snprintf, changed index to strchr
-**
-**  Revision 1.3  2000/04/28 18:00:55  kevin
-**  remove unused files
-**
-**  Revision 1.2  2000/04/28 17:38:26  kevin
-**  Removed unused files
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
-**
-**
+**  $Id: timedate.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -46,8 +23,9 @@
 /*----------------------------------------------------------------------*/
 
 #include <stdio.h>
-#include "kstddef.h"
 #include <time.h>
+#include "ctsupport.h"
+
 
 /* NAME
  *    td_get_time                      Return time of day

diff --git a/libctsupport/xform.cpp b/libctsupport/xform.cpp
index 8d58f766a4dfdcbbb0e19b48aeffe9fde4de7964..abf47500ad675a5b15ac96e8ac253c69d4fb5182 100644 (file)
--- a/libctsupport/xform.cpp
+++ b/libctsupport/xform.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: xform.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
+**  $Id: xform.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -18,7 +18,8 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-#include "kmath.h"
+#include "ctsupport.h"
+
 
 /* NAME
  *   rotate2d          Rotates an array of 2 dimensional vectors