r40: made c++ compatible

[ctsim.git] / include / kstddef.h

diff --git a/include/kstddef.h b/include/kstddef.h
index 04dc90076e245acac2596a54b8eb40600856f352..4a5771c267cf3c180afd8f4062d8facce562941e 100644 (file)
--- a/include/kstddef.h
+++ b/include/kstddef.h
@@ -2,8 +2,17 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: kstddef.h,v 1.4 2000/04/28 18:00:55 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
+**
+**  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
 **
@@ -46,6 +55,11 @@
 #ifndef STDDEF_H
 #define STDDEF_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -104,8 +118,12 @@ 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
@@ -180,13 +198,6 @@ double *alloc_double(int n);
 int *alloc_int(int n);
 /* fexist.c */
 int file_exists(const char *fname);
-/* fmax.c */
-double fmax(double a, double b);
-/* get_yn.c */
-int get_yn(const char *prompt);
-/* getch.c */
-int getch(void);
-void ungetch(int c);
 /* kbasename.c */
 char *kbasename(const char *filename);
 /* iclip.c */
@@ -195,12 +206,13 @@ int iclip(int n, int lb, int ub);
 char *str_skip_head(const char *str, const char *charlist);
 /* s_lower.c */
 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_upper(char *str);
-/* s_wtail.c */
-char *str_wrm_tail(char *str);
 /* sysalloc.c */
 void *sys_alloc(const int nbytes, const char *name);
 /* syserror.c */
@@ -229,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