This minor patch is 1a; the next minor patches will be 1b, 1c... and so on, until enough patches have accumulated to warrant grouping them into a major patch, which will then be available on athena-dist.mit.edu and be "patch1". If you are using Larry Wall's "patch" program, this patch should be applied by cd'ing into the directory above the "src" directory from the distribution, and typing patch -p4 < patch1a The changes included are: * include/olc/os.h: if has_ansi_includes is set, only exclude prototypes. * server/writed/Imakefile: fixed install (& other) rules. * clients/lib/io.c: fixed offset; should be 228, not 227. * include/olc/requests.h: fixed offset; should be 228, not 227. * server/olcd/s_io.c: fixed offset; should be 228, not 227. * server/rpd/Imakefile: alt install loc is in "new" directory structure * server/polld/Imakefile: alt install loc is "new" directory structure * server/olcm/Imakefile: alt install loc is "new" directory structure * server/olcd/Imakefile: alt install loc is "new" directory structure * server/lumberjack/Imakefile: alt install loc is "new" directory structure * man/Imakefile: alt install loc is "new" directory structure * clients/oreplay/Imakefile: alt install loc is "new" directory structure * clients/olc/Imakefile: alt install loc is "new" directory structure * include/rpd.h: define explicit location for srvtab * server/rpd/handle_request.c: give explicit location for srvtab * clients/parser/p_local.c: always give name of element of struct, even if it is the first one. * server/olcm/olcm.c: should use strncpy, not strcpy * server/olcd/s_io.c: only define MAX & MIN if not already defined. * server/lumberjack/lumberjack.c: fixed ifdef for PS/2 to not include Rios. * config/ibm.cf: added Rios-specific configuration * config/Imake.template: added Rios ifdefs * common/string_utils.c: arg to if must be parenthesized * server/polld/Imakefile: fixed so it only includes com_err when necessary * logger/bbd.c: fixed bug; was passing in wrong buf len * logger/log.c: use hesiod to look up default port (log_startup) take port number to use * logger/bbd.c: include "START" and "VIEW" tags use /etc/services to look up default port allow port to be specified on command line diff -c -r /brennin/u1/dist/src/clients/lib/io.c src/clients/lib/io.c *** /brennin/u1/dist/src/clients/lib/io.c Fri Apr 19 02:17:58 1991 --- src/clients/lib/io.c Wed May 8 10:59:51 1991 *************** *** 120,126 **** strncpy((char *) (net_req.data+194), request->requester.machine,32); i = htonl((u_long) request->target.uid); ! bcopy((char *) &i, (char *) (net_req.data+227), sizeof(i)); i = htonl((u_long) request->target.instance); bcopy((char *) &i, (char *) (net_req.data+232), sizeof(i)); --- 120,126 ---- strncpy((char *) (net_req.data+194), request->requester.machine,32); i = htonl((u_long) request->target.uid); ! bcopy((char *) &i, (char *) (net_req.data+228), sizeof(i)); i = htonl((u_long) request->target.instance); bcopy((char *) &i, (char *) (net_req.data+232), sizeof(i)); diff -c -r /brennin/u1/dist/src/clients/olc/Imakefile src/clients/olc/Imakefile *** /brennin/u1/dist/src/clients/olc/Imakefile Thu Apr 18 21:38:11 1991 --- src/clients/olc/Imakefile Tue May 7 22:20:20 1991 *************** *** 22,28 **** SaberProgramTarget(olc,$(SRCS),$(OBJS),$(LOCAL_LIBRARIES),$(SYS_LIBRARIES)) #ifdef InstallAltLoc ! InstallLink(olc,olcr,/mit/olcdev/@sys) #else InstallLink(olc,olcr,$(DESTDIR)/usr/athena) #endif --- 22,28 ---- SaberProgramTarget(olc,$(SRCS),$(OBJS),$(LOCAL_LIBRARIES),$(SYS_LIBRARIES)) #ifdef InstallAltLoc ! InstallLink(olc,olcr,$(DESTDIR)/usr/athena/bin) #else InstallLink(olc,olcr,$(DESTDIR)/usr/athena) #endif diff -c -r /brennin/u1/dist/src/clients/oreplay/Imakefile src/clients/oreplay/Imakefile *** /brennin/u1/dist/src/clients/oreplay/Imakefile Thu Apr 18 21:53:33 1991 --- src/clients/oreplay/Imakefile Tue May 7 22:31:18 1991 *************** *** 38,46 **** LintTarget() #ifdef InstallAltLoc ! InstallProgram(oreplay,/mit/olcdev/@sys) install:: ! (cd /mit/olcdev/@sys; $(RM) oshow; $(LN) oreplay oshow; $(RM) olist; $(LN) oreplay olist) #else InstallProgram(oreplay,$(DESTDIR)/usr/etc) install:: --- 38,46 ---- LintTarget() #ifdef InstallAltLoc ! InstallProgram(oreplay,$(DESTDIR)/usr/athena/bin) install:: ! (cd $(DESTDIR)/usr/athena/bin; $(RM) oshow; $(LN) oreplay oshow; $(RM) olist; $(LN) oreplay olist) #else InstallProgram(oreplay,$(DESTDIR)/usr/etc) install:: diff -c -r /brennin/u1/dist/src/clients/parser/p_local.c src/clients/parser/p_local.c *** /brennin/u1/dist/src/clients/parser/p_local.c Fri Apr 19 02:18:30 1991 --- src/clients/parser/p_local.c Mon May 6 23:23:44 1991 *************** *** 142,148 **** if (ind == NOT_UNIQUE) return(NOT_UNIQUE); ! (void) strcat(help_filename, Command_Table[ind]); } (void) strcat(help_filename, HELP_EXT); --- 142,148 ---- if (ind == NOT_UNIQUE) return(NOT_UNIQUE); ! (void) strcat(help_filename, Command_Table[ind].command_name); } (void) strcat(help_filename, HELP_EXT); diff -c -r /brennin/u1/dist/src/common/string_utils.c src/common/string_utils.c *** /brennin/u1/dist/src/common/string_utils.c Fri Apr 19 02:19:22 1991 --- src/common/string_utils.c Mon May 6 23:11:25 1991 *************** *** 62,68 **** { char *s1 = string; while(*s1 != '\0') { ! if islower(*s1) *s1 = toupper(*s1); s1++; } } --- 62,68 ---- { char *s1 = string; while(*s1 != '\0') { ! if (islower(*s1)) *s1 = toupper(*s1); s1++; } } diff -c -r /brennin/u1/dist/src/config/Imake.template src/config/Imake.template *** /brennin/u1/dist/src/config/Imake.template Fri Apr 19 01:13:24 1991 --- src/config/Imake.template Mon May 6 23:13:23 1991 *************** *** 170,175 **** --- 170,179 ---- #ifdef ibm032 #undef ibm032 #define RtArchitecture + #endif + #ifdef _IBMR2 + #undef _IBMR2 + #define RiosArchitecture #endif #ifdef aix #undef aix diff -c -r /brennin/u1/dist/src/config/ibm.cf src/config/ibm.cf *** /brennin/u1/dist/src/config/ibm.cf Fri Apr 19 00:59:36 1991 --- src/config/ibm.cf Tue May 7 15:04:41 1991 *************** *** 15,18 **** --- 15,28 ---- #ifdef RtArchitecture #define HasSaber 1 + #endif + + #ifdef RiosArchitecture + #define MachSpecDef -I/usr/athena/include -D_BSD -D_BSD_INCLUDES -DAIXV=31 -qlanglvl=extended + #define ExtraLoadFlags -lbsd + #define HaveAnsiIncludes 1 + #define HaveTermIO 1 + #define HaveMotif 0 + #define HaveDefErrno 0 + #define HasPutenv 1 #endif diff -c -r /brennin/u1/dist/src/include/rpd.h src/include/rpd.h *** /brennin/u1/dist/src/include/rpd.h Fri Apr 19 02:20:09 1991 --- src/include/rpd.h Tue May 7 11:10:06 1991 *************** *** 55,60 **** --- 55,61 ---- #ifdef KERBEROS #define K_SERVICE "olc" + #define SRVTAB "/usr/lib/olc/srvtab" #define MONITOR_ACL "/usr/lib/olc/acls/monitor.acl" /* system */ diff -c -r /brennin/u1/dist/src/include/olc/requests.h src/include/olc/requests.h *** /brennin/u1/dist/src/include/olc/requests.h Fri Apr 19 02:19:46 1991 --- src/include/olc/requests.h Wed May 8 10:57:42 1991 *************** *** 88,94 **** 194 r_machine char[32] machine name 226 r_pad char[2] padding (historical) --- target data --- ! 227 t_uid net long uid 232 t_instance net long instance 236 t_username char[10] username 246 t_realname char[32] "real" name --- 88,94 ---- 194 r_machine char[32] machine name 226 r_pad char[2] padding (historical) --- target data --- ! 228 t_uid net long uid 232 t_instance net long instance 236 t_username char[10] username 246 t_realname char[32] "real" name diff -c -r /brennin/u1/dist/src/logger/bbd.c src/logger/bbd.c *** /brennin/u1/dist/src/logger/bbd.c Fri Apr 19 02:24:02 1991 --- src/logger/bbd.c Tue Apr 23 16:10:19 1991 *************** *** 26,33 **** --- 26,36 ---- #include #include #include + #include #include + #define SERVICE_NAME "ols" + int log_fd; #ifdef NEEDS_ERRNO_DEFS *************** *** 89,94 **** --- 92,98 ---- close(fd); + write(log_fd,"START ",6); write(log_fd,msg,len); write(log_fd," ",1); write(log_fd,buf,strlen(buf)); *************** *** 102,110 **** --- 106,116 ---- int nofork = 0; int fd; struct sockaddr_in name,from; + struct servent *service; char buf[1024]; int onoff; int len,rlen,i; + int port=0; for (i=1;is_port; + } + else + port = htons(port); + + /* Create name with wildcards */ name.sin_family = AF_INET; ! name.sin_port = port; onoff = 1; if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &onoff, sizeof(int))) { *************** *** 199,207 **** continue; } if (buf[0] == 'S') ! handle_startup(fd,&buf[1],rlen,from,logfile); else { ! write(log_fd,&buf[1],rlen); write(log_fd,"\n",1); } } --- 225,234 ---- continue; } if (buf[0] == 'S') ! handle_startup(fd,&buf[1],(rlen-1),from,logfile); else { ! write(log_fd,"VIEW ",5); ! write(log_fd,&buf[1],(rlen-1)); write(log_fd,"\n",1); } } diff -c -r /brennin/u1/dist/src/logger/log.c src/logger/log.c *** /brennin/u1/dist/src/logger/log.c Fri Apr 19 02:24:04 1991 --- src/logger/log.c Tue Apr 23 15:13:55 1991 *************** *** 41,46 **** --- 41,48 ---- #endif + #define DEFAULT_SERVICE_NAME "ols" + static int session_id; static int fd; static int punt = 0; *************** *** 47,65 **** static struct sockaddr_in name; void ! log_startup(type,log_host) char *type; char *log_host; { char buf[BUFSIZ]; char hostnm[MAXHOSTNAMELEN]; char *t,*p; struct hostent *hp, *gethostbyname(); time_t now; fd_set readfds; int nfound,len; struct timeval timeout; if ((fd = socket(AF_INET,SOCK_DGRAM,0)) < 0) { punt = 1; return; --- 49,82 ---- static struct sockaddr_in name; void ! log_startup(type,log_host,port) char *type; char *log_host; + int port; { char buf[BUFSIZ]; char hostnm[MAXHOSTNAMELEN]; char *t,*p; struct hostent *hp, *gethostbyname(); + struct servent *service; time_t now; fd_set readfds; int nfound,len; struct timeval timeout; + /* Find port number if not already defined */ + if (port == 0) { + if ((service = getservbyname(DEFAULT_SERVICE_NAME,"tcp")) == + (struct servent *) NULL) { + punt = 1; + return; + } + port = service->s_port; + } + else + port = htons(port); + + if ((fd = socket(AF_INET,SOCK_DGRAM,0)) < 0) { punt = 1; return; *************** *** 72,78 **** bcopy(hp->h_addr,&name.sin_addr,hp->h_length); name.sin_family = AF_INET; ! name.sin_port = htons(2052); if (connect(fd, &name, sizeof(name))< 0) { punt = 1; --- 89,95 ---- bcopy(hp->h_addr,&name.sin_addr,hp->h_length); name.sin_family = AF_INET; ! name.sin_port = port; if (connect(fd, &name, sizeof(name))< 0) { punt = 1; diff -c -r /brennin/u1/dist/src/man/Imakefile src/man/Imakefile *** /brennin/u1/dist/src/man/Imakefile Fri Apr 19 02:09:00 1991 --- src/man/Imakefile Tue May 7 22:23:05 1991 *************** *** 11,17 **** --- 11,21 ---- PAGES = olc.1 olcr.1 olc_answers.1 cref.1 + #ifdef InstallAltLoc + InstallMultipleDestFlags(install,$(PAGES),$(DESTDIR)/usr/athena/man/man1,$(INSTMANFLAGS)) + #else InstallMultipleDestFlags(install,$(PAGES),$(DESTDIR)/usr/man/man1,$(INSTMANFLAGS)) + #endif depend:: diff -c -r /brennin/u1/dist/src/server/lumberjack/Imakefile src/server/lumberjack/Imakefile *** /brennin/u1/dist/src/server/lumberjack/Imakefile Thu Apr 18 22:20:22 1991 --- src/server/lumberjack/Imakefile Tue May 7 22:23:49 1991 *************** *** 28,34 **** SaberProgramTarget(lumberjack,$(SRCS),$(OBJS),,) #ifdef InstallAltLoc ! InstallProgram(lumberjack,/mit/olcdev/@sys) #else InstallProgram(lumberjack,$(DESTDIR)/usr/etc) #endif --- 28,34 ---- SaberProgramTarget(lumberjack,$(SRCS),$(OBJS),,) #ifdef InstallAltLoc ! InstallProgram(lumberjack,$(DESTDIR)/usr/athena/etc) #else InstallProgram(lumberjack,$(DESTDIR)/usr/etc) #endif diff -c -r /brennin/u1/dist/src/server/lumberjack/lumberjack.c src/server/lumberjack/lumberjack.c *** /brennin/u1/dist/src/server/lumberjack/lumberjack.c Fri Apr 19 02:22:49 1991 --- src/server/lumberjack/lumberjack.c Mon May 6 23:19:08 1991 *************** *** 44,50 **** int fd; /* file descriptor of control file */ int retval; /* Error code returned by system */ FILE *file; /* file stream used to read control file */ ! #if !defined(_AIX) && !defined(SYSV) union wait status; #else int status; --- 44,50 ---- int fd; /* file descriptor of control file */ int retval; /* Error code returned by system */ FILE *file; /* file stream used to read control file */ ! #if !defined(_i386) && !defined(SYSV) union wait status; #else int status; diff -c -r /brennin/u1/dist/src/server/olcd/Imakefile src/server/olcd/Imakefile *** /brennin/u1/dist/src/server/olcd/Imakefile Thu Apr 18 22:19:04 1991 --- src/server/olcd/Imakefile Tue May 7 22:24:30 1991 *************** *** 47,53 **** LintTarget() #ifdef InstallAltLoc ! InstallProgram(olcd,/mit/olcdev/@sys) #else InstallProgram(olcd,$(DESTDIR)/usr/etc) #endif --- 47,53 ---- LintTarget() #ifdef InstallAltLoc ! InstallProgram(olcd,$(DESTDIR)/usr/athena/etc) #else InstallProgram(olcd,$(DESTDIR)/usr/etc) #endif diff -c -r /brennin/u1/dist/src/server/olcd/s_io.c src/server/olcd/s_io.c *** /brennin/u1/dist/src/server/olcd/s_io.c Fri Apr 19 02:22:35 1991 --- src/server/olcd/s_io.c Wed May 8 10:56:54 1991 *************** *** 49,56 **** --- 49,60 ---- extern char DaemonHost[]; /* Name of daemon's machine. */ extern int errno; + #ifndef MIN #define MIN(a,b) ((a)>(b)?(b):(a)) + #endif + #ifndef MAX #define MAX(a,b) ((a)<(b)?(b):(a)) + #endif /* * Note: All functions that deal with I/O on sockets in this file use the *************** *** 111,117 **** strncpy(request->requester.title, (char *) (net_req.data+162), 32); strncpy(request->requester.machine, (char *) (net_req.data+194), 32); ! request->target.uid = (ntohl(*((u_long *) (net_req.data+227)))); request->target.instance = (ntohl(*((u_long *) (net_req.data+232)))); --- 115,121 ---- strncpy(request->requester.title, (char *) (net_req.data+162), 32); strncpy(request->requester.machine, (char *) (net_req.data+194), 32); ! request->target.uid = (ntohl(*((u_long *) (net_req.data+228)))); request->target.instance = (ntohl(*((u_long *) (net_req.data+232)))); diff -c -r /brennin/u1/dist/src/server/olcm/Imakefile src/server/olcm/Imakefile *** /brennin/u1/dist/src/server/olcm/Imakefile Thu Apr 18 22:19:46 1991 --- src/server/olcm/Imakefile Tue May 7 22:25:07 1991 *************** *** 30,36 **** SaberProgramTarget(olcm,$(SRCS),$(OBJS),,$(SYS_LIBRARIES)) #ifdef InstallAltLoc ! InstallProgram(olcm,/mit/olcdev/@sys) #else InstallProgram(olcm,$(DESTDIR)/usr/etc) #endif --- 30,36 ---- SaberProgramTarget(olcm,$(SRCS),$(OBJS),,$(SYS_LIBRARIES)) #ifdef InstallAltLoc ! InstallProgram(olcm,$(DESTDIR)/usr/athena/etc) #else InstallProgram(olcm,$(DESTDIR)/usr/etc) #endif diff -c -r /brennin/u1/dist/src/server/olcm/olcm.c src/server/olcm/olcm.c *** /brennin/u1/dist/src/server/olcm/olcm.c Fri Apr 19 02:22:46 1991 --- src/server/olcm/olcm.c Mon May 6 23:21:16 1991 *************** *** 183,189 **** if (end != p) { *end = '\0'; ! strcpy(username,p,8); username[8] = '\0'; } } --- 183,189 ---- if (end != p) { *end = '\0'; ! strncpy(username,p,8); username[8] = '\0'; } } diff -c -r /brennin/u1/dist/src/server/polld/Imakefile src/server/polld/Imakefile *** /brennin/u1/dist/src/server/polld/Imakefile Thu Apr 18 22:21:21 1991 --- src/server/polld/Imakefile Tue May 7 22:26:12 1991 *************** *** 30,36 **** #if HaveKerberos || HaveZephyr SYS_LIBRARIES= $(HesiodLib) $(ZephyrLib) $(KerberosLib) $(ComErrLib) #else ! SYS_LIBRARIES= $(HesiodLib) $(ZephyrLib) $(KerberosLib) $(ComErrLib) #endif NormalProgramTarget(polld,$(OBJS),$(LOCAL_LIBRARIES),$(LOCAL_LIBRARIES),$(SYS_LIBRARIES)) --- 30,36 ---- #if HaveKerberos || HaveZephyr SYS_LIBRARIES= $(HesiodLib) $(ZephyrLib) $(KerberosLib) $(ComErrLib) #else ! SYS_LIBRARIES= $(HesiodLib) $(ZephyrLib) $(KerberosLib) #endif NormalProgramTarget(polld,$(OBJS),$(LOCAL_LIBRARIES),$(LOCAL_LIBRARIES),$(SYS_LIBRARIES)) *************** *** 41,47 **** LintTarget() #ifdef InstallAltLoc ! InstallProgram(polld,/mit/olcdev/@sys) #else InstallProgram(polld,$(DESTDIR)/usr/etc) #endif --- 41,47 ---- LintTarget() #ifdef InstallAltLoc ! InstallProgram(polld,$(DESTDIR)/usr/athena/etc) #else InstallProgram(polld,$(DESTDIR)/usr/etc) #endif diff -c -r /brennin/u1/dist/src/server/rpd/Imakefile src/server/rpd/Imakefile *** /brennin/u1/dist/src/server/rpd/Imakefile Thu Apr 18 22:25:05 1991 --- src/server/rpd/Imakefile Tue May 7 22:26:48 1991 *************** *** 37,43 **** LintTarget() #ifdef InstallAltLoc ! InstallProgram(rpd,/mit/olcdev/@sys) #else InstallProgram(rpd,$(DESTDIR)/usr/etc) #endif --- 37,43 ---- LintTarget() #ifdef InstallAltLoc ! InstallProgram(rpd,$(DESTDIR)/usr/athena/etc) #else InstallProgram(rpd,$(DESTDIR)/usr/etc) #endif diff -c -r /brennin/u1/dist/src/server/rpd/handle_request.c src/server/rpd/handle_request.c *** /brennin/u1/dist/src/server/rpd/handle_request.c Fri Apr 19 02:23:01 1991 --- src/server/rpd/handle_request.c Tue May 7 11:08:37 1991 *************** *** 161,167 **** #ifdef KERBEROS auth = krb_rd_req(&their_auth,K_SERVICE,instance_buffer, ! (unsigned long) from.sin_addr.s_addr,&their_info,""); if (auth != RD_AP_OK) { /* Twit! */ syslog(LOG_WARNING,"Kerberos error: %s\n from %s",krb_err_txt[auth], --- 161,167 ---- #ifdef KERBEROS auth = krb_rd_req(&their_auth,K_SERVICE,instance_buffer, ! (unsigned long) from.sin_addr.s_addr,&their_info,SRVTAB); if (auth != RD_AP_OK) { /* Twit! */ syslog(LOG_WARNING,"Kerberos error: %s\n from %s",krb_err_txt[auth], diff -c -r /brennin/u1/dist/src/server/writed/Imakefile src/server/writed/Imakefile *** /brennin/u1/dist/src/server/writed/Imakefile Thu Apr 18 22:27:22 1991 --- src/server/writed/Imakefile Wed May 8 11:14:09 1991 *************** *** 1,8 **** # ! # $Id: Imakefile,v 1.2 91/04/18 22:27:15 lwvanels Exp $ # $Source: /afs/athena.mit.edu/astaff/project/olcdev/src/server/writed/RCS/Imakefile,v $ # Copyright (C) 1991 by the Massachusetts Institute of Technology. # For copying and distribution information, see the file "mit-copyright.h". # ! SimpleProgramTarget(writed) --- 1,24 ---- # ! # $Id: Imakefile,v 1.3 91/05/08 11:06:57 lwvanels Exp $ # $Source: /afs/athena.mit.edu/astaff/project/olcdev/src/server/writed/RCS/Imakefile,v $ # Copyright (C) 1991 by the Massachusetts Institute of Technology. # For copying and distribution information, see the file "mit-copyright.h". # ! SRCS = writed.c ! OBJS = writed.o ! ! NormalProgramTarget(writed,$(OBJS),,,) ! SaberProgramTarget(writed,$(SRCS),$(OBJS),,) ! ! DependSrcs() ! ! LintTarget() ! ! #ifdef InstallAltLoc ! InstallProgram(writed,$(DESTDIR)/etc/athena) ! #else ! InstallProgram(writed,$(DESTDIR)/etc) ! #endif ! ! AllTarget(writed) diff -c -r /brennin/u1/dist/src/wcl/Imakefile src/wcl/Imakefile *** /brennin/u1/dist/src/wcl/Imakefile Tue Apr 16 19:33:11 1991 --- src/wcl/Imakefile Wed May 8 16:05:45 1991 *************** *** 65,77 **** LIBWC_OBJS = WcCreate.o WcCallb.o WcConvert.o WcName.o \ WcReg.o WcActions.o WcRegXt.o - NormalLibraryObjectRule() - NormalLibraryTarget(Wc, $(LIBWC_OBJS)) MakeDirectories(install, $(INSTALLIBDIR)) InstallLibrary(Wc, $(INSTALLLIBDIR)) MakeDirectories(install, $(INSTALLINCDIR)) InstallMultiple($(LIBWC_INCS), $(INSTALLINCDIR)) #ifdef HAVE_MOTIF # --- 65,77 ---- LIBWC_OBJS = WcCreate.o WcCallb.o WcConvert.o WcName.o \ WcReg.o WcActions.o WcRegXt.o NormalLibraryTarget(Wc, $(LIBWC_OBJS)) MakeDirectories(install, $(INSTALLIBDIR)) InstallLibrary(Wc, $(INSTALLLIBDIR)) MakeDirectories(install, $(INSTALLINCDIR)) InstallMultiple($(LIBWC_INCS), $(INSTALLINCDIR)) + + depend:: #ifdef HAVE_MOTIF # diff -c -r src/include/olc/os.h /mit/olcdev/src/include/olc/os.h *** /brennin/u1/dist/src/include/olc/os.h Fri Apr 19 02:19:58 1991 --- src/include/olc/os.h Wed May 8 20:53:06 1991 *************** *** 7,18 **** * For copying and distribution information, see the file "mit-copyright.h". * * $Source: /afs/athena.mit.edu/astaff/project/olcdev/src/include/olc/RCS/os.h,v $ ! * $Id: os.h,v 1.6 91/04/08 21:01:33 lwvanels Rel $ * $Author: lwvanels $ */ ! #ifndef HAS_ANSI_INCLUDES ! #include #include #include #include --- 7,17 ---- * For copying and distribution information, see the file "mit-copyright.h". * * $Source: /afs/athena.mit.edu/astaff/project/olcdev/src/include/olc/RCS/os.h,v $ ! * $Id: os.h,v 1.7 91/05/08 20:52:51 lwvanels Exp $ * $Author: lwvanels $ */ ! #include #include #include #include *************** *** 21,26 **** --- 20,26 ---- #endif #include + #ifndef HAS_ANSI_INCLUDES #ifndef __olc_os_h #define __olc_os_h