projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r41: ANSI C changes
[ctsim.git]
/
include
/
kstddef.h
diff --git
a/include/kstddef.h
b/include/kstddef.h
index 3ad537aa8c843d48b1071c24675afdf49c14729b..deb65fa70b03052ef3b06efef94bd5d4a951bd98 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: kstddef.h,v 1.
5 2000/05/02 20:00:25
kevin Exp $
+** $Id: kstddef.h,v 1.
8 2000/05/08 20:00:48
kevin Exp $
** $Log: kstddef.h,v $
** $Log: kstddef.h,v $
+** Revision 1.8 2000/05/08 20:00:48 kevin
+** ANSI C changes
+**
+** 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.5 2000/05/02 20:00:25 kevin
** *** empty log message ***
**
@@
-49,6
+58,11
@@
#ifndef STDDEF_H
#define STDDEF_H
#ifndef STDDEF_H
#define STDDEF_H
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-65,17
+79,12
@@
typedef signed int bool; /* Boolean variable type */
typedef unsigned char string[STR_SIZE];
typedef unsigned char string[STR_SIZE];
-#define UNSIGNLONG unsigned long int
-#define UNSIGNCHAR unsigned char
-
#define TRUE 1
#define FALSE 0
#define OK TRUE
#define ERROR FALSE
#define YES TRUE
#define NO FALSE
#define TRUE 1
#define FALSE 0
#define OK TRUE
#define ERROR FALSE
#define YES TRUE
#define NO FALSE
-#define ON TRUE
-#define OFF FALSE
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
@@
-83,11
+92,6
@@
typedef unsigned char string[STR_SIZE];
/*----------------------------------------------------------------------*/
/*----------------------------------------------------------------------*/
-#define INTERNAL_FUNC static
-#define INTERNAL_VAR static
-
-/*----------------------------------------------------------------------*/
-
#define NEWLINE '\n'
#define TAB '\t'
#define EOS '\0'
#define NEWLINE '\n'
#define TAB '\t'
#define EOS '\0'
@@
-107,8
+111,12
@@
typedef unsigned char string[STR_SIZE];
#define ABS(x) ((x) < 0 ? -(x) : (x))
#define SQR(x) ((x) * (x))
#define ABS(x) ((x) < 0 ? -(x) : (x))
#define SQR(x) ((x) * (x))
+#ifndef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
#define MIN(a,b) ((a) <= (b) ? (a) : (b))
#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
#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
@@
-144,11
+152,7
@@
typedef struct timedate_st TIMEDATE;
/* codes for open command */
/* codes for open command */
-#ifdef LATTICE
-#define OPEN_RDONLY 0x8000 /* Lattice codes for binary i/o */
-#define OPEN_WRONLY 0x8001
-#define OPEN_RDWR 0x8002
-#elif MICROSOFT
+#if MICROSOFT
#define OPEN_RDONLY O_RDONLY /* other system use standard codes */
#define OPEN_WRONLY O_WRONLY /* for binary */
#define OPEN_RDWR O_RDWR
#define OPEN_RDONLY O_RDONLY /* other system use standard codes */
#define OPEN_WRONLY O_WRONLY /* for binary */
#define OPEN_RDWR O_RDWR
@@
-226,4
+230,8
@@
char *td_str_cdate(DATE *d);
char *td_month_name(int n);
char *td_day_name(int n);
char *td_month_name(int n);
char *td_day_name(int n);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
#endif
#endif