From c15d94034f5f815fc058c49c4b16f48ded042fd9 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 5 Jun 2000 01:32:45 +0000 Subject: [PATCH] r68: Added C++ compatibility --- include/cio.h | 7 ++-- include/ir.h | 12 +++++-- include/kstddef.h | 86 +++++++++++++++++++++++++++++++++-------------- 3 files changed, 75 insertions(+), 30 deletions(-) diff --git a/include/cio.h b/include/cio.h index fd54e7a..1d14b89 100644 --- 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.7 2000/05/08 20:45:10 kevin Exp $ +** $Id: cio.h,v 1.8 2000/06/05 01:32:45 kevin Exp $ ** $Log: cio.h,v $ +** Revision 1.8 2000/06/05 01:32:45 kevin +** Added C++ compatibility +** ** Revision 1.7 2000/05/08 20:45:10 kevin ** *** empty log message *** ** @@ -82,7 +85,7 @@ void cio_kb_ungetc(unsigned int c); char *cio_kb_gets(char *str, int maxlen); unsigned int cio_kb_waitc(const char *astr, int beep); -#ifdef _cplusplus +#ifdef __cplusplus } #endif /* _cplusplus */ diff --git a/include/ir.h b/include/ir.h index 652e5cb..3cc918a 100644 --- 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 */ diff --git a/include/kstddef.h b/include/kstddef.h index 2f13492..f02ea8d 100644 --- 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.11 2000/06/03 06:29:08 kevin Exp $ +** $Id: kstddef.h,v 1.12 2000/06/05 01:32:45 kevin Exp $ ** $Log: kstddef.h,v $ +** Revision 1.12 2000/06/05 01:32:45 kevin +** Added C++ compatibility +** ** Revision 1.11 2000/06/03 06:29:08 kevin ** *** empty log message *** ** @@ -68,6 +71,23 @@ #ifndef STDDEF_H #define STDDEF_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef _WIN32 +#define snprintf _snprintf +#endif + +#if !defined(bool) && !defined(__cplusplus) +typedef int bool; /* Boolean variable type */ +#endif + +#define STR_MAX_LEN 255 +#define STR_SIZE STR_MAX_LEN+1 + +typedef unsigned char string[STR_SIZE]; + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -80,15 +100,6 @@ extern "C" { #undef SHELL -#define STR_MAX_LEN 255 -#define STR_SIZE STR_MAX_LEN+1 - -#ifndef bool -typedef signed int bool; /* Boolean variable type */ -#endif - -typedef unsigned char string[STR_SIZE]; - #define TRUE 1 #define FALSE 0 #define OK TRUE @@ -135,7 +146,7 @@ typedef unsigned char string[STR_SIZE]; /*----------------------------------------------------------------------*/ struct time_st { - int hour, minute, second, hs; + int hour, minute, second, ms; }; struct date_st { @@ -190,6 +201,39 @@ typedef struct timedate_st TIMEDATE; #define S_IWRITE S_IWUSR #endif +/*----------------------------------------------------------------------*/ + +#if defined(MICROSOFT) || ! defined(SIZEOF_INT) + #define SIZEOF_INT 4 + #define SIZEOF_LONG 4 + #define SIZEOF_SHORT 2 + #define SIZEOF_FLOAT 4 + #define SIZEOF_DOUBLE 8 +#endif + +#if SIZEOF_INT == 4 + typedef int kint32; + typedef unsigned int kuint32; +#elif SIZEOF_LONG == 4 + typedef long int kint32; + typedef unsigned int kuint32; +#endif + +#if SIZEOF_SHORT == 2 + typedef short int kint16; + typedef unsigned short int kuint16; +#elif SIZEOF_INT == 2 + typedef int kint16; + typedef unsigned int kuint16; +#endif + +#if SIZEOF_FLOAT == 4 + typedef float kfloat32; +#endif +#if SIZEOF_DOUBLE == 8 + typedef double kfloat64; +#endif + /* allocnum.c */ float *alloc_float(int n); double *alloc_double(int n); @@ -254,20 +298,12 @@ char *td_day_name(int n); /* netorder.c */ void *strreverse (void *dest, const void *src, size_t n); -#if SIZEOF_SHORT == 4 -int read_n32bint (unsigned short *n, int fd); -int write_n32bint (unsigned short const *n, int fd); -#elif SIZEOF_LONG == 4 -int read_n32bint (unsigned long *n, int fd); -int write_n32bint (unsigned long const *n, int fd); -#else -int read_n32bint (unsigned int *n, int fd); -int write_n32bint (unsigned int const *n, int fd); -#endif -int read_nfloat (float *f, int fd); -int write_nfloat (float const *f, int fd); -int read_ndouble (double *d, int fd); -int write_ndouble (double const *d, int fd); +int read_n32bint (kuint32 *n, int fd); +int write_n32bint (kuint32 const *n, int fd); +int read_nfloat32 (float *f, int fd); +int write_nfloat32 (float const *f, int fd); +int read_nfloat64 (double *d, int fd); +int write_nfloat64 (double const *d, int fd); #ifdef __cplusplus } -- 2.34.1