X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fkstddef.h;h=5634ef9862be74f2be521f27e95803feb6b5408d;hb=da11926c1039ae4c880915db508d69614ec7c79e;hp=e80e3e56f8311b35920f95493a5633ed2514e76b;hpb=2ddfd9280d343189cd52abe2ba0d7bd4879f9f2c;p=ctsim.git diff --git a/include/kstddef.h b/include/kstddef.h index e80e3e5..5634ef9 100644 --- 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.3 2000/04/28 17:38:16 kevin Exp $ +** $Id: kstddef.h,v 1.6 2000/05/03 19:51:41 kevin Exp $ ** $Log: kstddef.h,v $ +** 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 ** @@ -101,8 +110,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 @@ -171,54 +184,27 @@ typedef struct timedate_st TIMEDATE; #define S_IWRITE S_IWUSR #endif -/* alloc.c */ -void *alloc(unsigned int nbytes); /* allocnum.c */ float *alloc_float(int n); double *alloc_double(int n); int *alloc_int(int n); -/* cdate.c */ -char *td_str_cdate(DATE *d); -char *td_month_name(int n); -char *td_day_name(int n); -/* ctoi.c */ -char *ctoi(const char *s, int *ival); /* 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 */ int iclip(int n, int lb, int ub); -/* irand.c */ -unsigned int irand(unsigned int n); -/* ltostr.c */ -int ltostr(long val, char *cp, int base); -/* s_clip.c */ -char *str_clip_tail(char *str, unsigned int nclip); /* s_head.c */ char *str_skip_head(const char *str, const char *charlist); /* s_lower.c */ char *str_lower(char *s); -/* s_make.c */ -char *str_make(char *str, int c, const int n); -/* s_rmhead.c */ -char *str_wrm_head(char *str); -char *str_rm_head(char *str, const char *skip_str); /* 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); -/* strncmpc.c */ -int strncmpc(const char *s, const char *t, int n); /* sysalloc.c */ void *sys_alloc(const int nbytes, const char *name); /* syserror.c */ @@ -243,7 +229,8 @@ const char *td_str_tmdt(const TIMEDATE *td); const char *td_str_time(const TIME *t); const char *td_str_stime(const TIME *t); const char *td_str_date(const DATE *d); -/* kbasename.c */ -char *kbasename(const char *filename); +char *td_str_cdate(DATE *d); +char *td_month_name(int n); +char *td_day_name(int n); #endif