r94: finished c++ conversions

[ctsim.git] / include / kstddef.h

diff --git a/include/kstddef.h b/include/kstddef.h
index 917e59d6075c1305b45eab4380280671d3cbf86c..dfb35431e281c53a15218d0c0bc9fdc5165ece67 100644 (file)
--- a/include/kstddef.h
+++ b/include/kstddef.h
@@ -1,47 +1,15 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: kstddef.h,v 1.14 2000/06/07 03:49:54 kevin Exp $
-**  $Log: kstddef.h,v $
-**  Revision 1.14  2000/06/07 03:49:54  kevin
-**  *** empty log message ***
-**
-**  Revision 1.13  2000/06/07 00:59:38  kevin
-**  added imagefiles
-**
-**  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 ***
-**
-**  Revision 1.10  2000/05/16 04:33:17  kevin
-**  Updated documentation
-**
-**  Revision 1.9  2000/05/11 01:04:44  kevin
-**  Added Microsoft Windows compatibility
-**
-**  Revision 1.8  2000/05/08 20:00:48  kevin
-**  ANSI C changes
+** FILE IDENTIFICATION
 **
-**  Revision 1.7  2000/05/07 12:46:19  kevin
-**  made c++ compatible
+**     File Name:      kstddef.h
+**     Author:         Kevin Rosenberg
+**     Purpose:        Header file containing KRL standard C definitions
+**     Date Started:   Dec. 83
 **
-**  Revision 1.6  2000/05/03 19:51:41  kevin
-**  function renaming for phantoms and phantom elements
-**
-**  Revision 1.5  2000/05/02 20:00:25  kevin
-**  *** empty log message ***
-**
-**  Revision 1.4  2000/04/28 18:00:55  kevin
-**  remove unused files
-**
-**  Revision 1.3  2000/04/28 17:38:16  kevin
-**  Removed unused files
+**  This is part of the CTSim program
+**  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  Revision 1.2  2000/04/28 14:14:16  kevin
-**  *** empty log message ***
+**  $Id: kstddef.h,v 1.16 2000/06/13 16:20:31 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -58,22 +26,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-/******************************************************************************
- *
- * FILE IDENTIFICATION
- *
- *     File Name:      STDDEF.H
- *     Author:         Kevin Rosenberg
- *     Purpose:        Header file containing KRL standard C definitions
- *     Date Started:   Dec. 83
- *
- * DESCRIPTION
- *     Header file contains KRL standard C definitions
- *
- * MODIFICATION LOG
- *
- *****************************************************************************/
-
 #ifndef STDDEF_H
 #define STDDEF_H
 
@@ -85,17 +37,9 @@
 #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
 
-#if !defined(__cplusplus)
-typedef unsigned char string[STR_SIZE];
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -135,12 +79,6 @@ typedef unsigned char string[STR_SIZE];
 #define ABS(x)    ((x) < 0 ? -(x) : (x))
 #define SQR(x)    ((x) * (x))
 
-#ifndef MAX
-#define MAX(a,b)  ((a) > (b) ? (a) : (b))
-#endif
-#ifndef MIN
-#define MIN(a,b)  ((a) <= (b) ? (a) : (b))
-#endif
 #define ISWAP(a,b) {int i; i = a; a = b; b = i;}
 
 #define CLIP(n,lb,ub)  if (n < lb) n = lb; else if (n > ub) n = ub
@@ -240,56 +178,25 @@ typedef unsigned char kuint8;
     typedef double kfloat64;
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/* allocnum.c */
-float *alloc_float(int n);
-double *alloc_double(int n);
-int *alloc_int(int n);
-
-/* fexist.c */
-int file_exists(const char *fname);
-
-/* kbasename.c */
-char *kbasename(const char *filename);
-
-/* iclip.c */
-int iclip(int n, int lb, int ub);
-
-/* s_head.c */
-char *str_skip_head(const char *str, const char *charlist);
+/* filefuncs.cpp */
+bool file_exists(const char* fname);
+const char* fileBasename(const char* filename);
+FILE *sys_fopen(const char *filename, const char *mode, const char *progname);
 
-/* s_lower.c */
+/* strfuncs.cpp */
+const char* str_skip_head(char* const str, const char* const charlist);
+char* str_skip_head(char* str, char* charlist);
 char *str_lower(char *s);
-
-/* s_rmtail.c */
 char *str_wrm_tail(char *str);
-char *str_rm_tail(char *str, const char *charlist);
-
-/* s_save.c */
-char *str_save(const char *s);
-
-/* s_upper.c */
+char *str_rm_tail(char *str, const char* const charlist);
 char *str_upper(char *str);
 
-/* sysalloc.c */
-void *sys_alloc(const int nbytes, const char *name);
-
-/* syserror.c */
+/* syserror.cpp */
 void sys_error(int severity, const char *msg, ...);
 void sys_verror(int severity, const char *msg, va_list arg);
 void sys_error_level(int severity);
 
-/* sysfopen.c */
-FILE *sys_fopen(const char *filename, const char *mode, const char *progname);
-
-/* sysfree.c */
-void sys_free(void *ptr, const char *name);
-
-/* timedate.c */
+/* timedate.cpp */
 DATE *td_get_date(DATE *d);
 TIME *td_get_time(TIME *t);
 double td_current_sec(void);
@@ -307,7 +214,7 @@ char *td_str_cdate(DATE *d);
 char *td_month_name(int n);
 char *td_day_name(int n);
 
-/* netorder.c */
+/* netorder.cpp */
 void *strreverse (void *dest, const void *src, size_t n);
 int read_nint16 (kuint16 *n, int fd);
 int write_nint16 (kuint16 const *n, int fd);
@@ -318,9 +225,6 @@ int write_nfloat32 (float const *f, int fd);
 int read_nfloat64 (double *d, int fd);
 int write_nfloat64 (double const *d, int fd);
 void ConvertNetworkOrder (void* buffer, size_t bytes);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+void ConvertReverseNetworkOrder (void* buffer, size_t bytes);
 
 #endif