[2391] in Release_Engineering
patches for zephyr for A/UX
daemon@ATHENA.MIT.EDU (Mark D. Virtue)
Fri Jul 6 14:35:25 1990
Date: Fri, 6 Jul 90 11:33:52 PDT
From: Mark D. Virtue <vrt@horton.mit.edu>
To: raeburn@ATHENA.MIT.EDU, rel-eng@ATHENA.MIT.EDU
diff -rc src/clients/syslogd/syslogd.c /source/athena/athena.lib/zephyr/clients/syslogd/syslogd.c
*** src/clients/syslogd/syslogd.c Sat Jun 9 16:09:26 1990
--- /source/athena/athena.lib/zephyr/clients/syslogd/syslogd.c Thu Apr 13 10:11:05 1989
***************
*** 56,64
#define TIMERINTVL 30 /* interval for checking flush, mark */
#include <stdio.h>
- #ifdef macII
- #include <sys/types.h>
- #endif
#include <utmp.h>
#include <ctype.h>
#include <strings.h>
--- 56,61 -----
#define TIMERINTVL 30 /* interval for checking flush, mark */
#include <stdio.h>
#include <utmp.h>
#include <ctype.h>
#include <strings.h>
***************
*** 108,118
#define NOPRI 0x10 /* the "no priority" priority */
#define LOG_MARK LOG_MAKEPRI(LOG_NFACILITIES, 0) /* mark "facility" */
- #ifdef macII
- #include <time.h>
- #include <strings.h>
- #endif
-
/*
* Flags to logmsg().
*/
--- 105,110 -----
#define NOPRI 0x10 /* the "no priority" priority */
#define LOG_MARK LOG_MAKEPRI(LOG_NFACILITIES, 0) /* mark "facility" */
/*
* Flags to logmsg().
*/
***************
*** 313,319
(void) dup2(0, 2);
untty();
} else
- #ifndef macII
setlinebuf(stdout);
#else
{
--- 305,310 -----
(void) dup2(0, 2);
untty();
} else
setlinebuf(stdout);
consfile.f_type = F_CONSOLE;
***************
*** 315,326
} else
#ifndef macII
setlinebuf(stdout);
- #else
- {
- static char buf[BUFSIZ];
- setvbuf (stdout, buf, _IOLBF, BUFSIZ);
- }
- #endif
consfile.f_type = F_CONSOLE;
(void) strcpy(consfile.f_un.f_fname, ctty);
--- 306,311 -----
untty();
} else
setlinebuf(stdout);
consfile.f_type = F_CONSOLE;
(void) strcpy(consfile.f_un.f_fname, ctty);
diff -rc src/clients/zleave/zleave.c /source/athena/athena.lib/zephyr/clients/zleave/zleave.c
*** src/clients/zleave/zleave.c Fri Jun 8 16:02:08 1990
--- /source/athena/athena.lib/zephyr/clients/zleave/zleave.c Tue Mar 13 03:46:23 1990
***************
*** 13,22
#include <zephyr/mit-copyright.h>
- #ifdef macII
- #include <time.h>
- #endif
-
#include <zephyr/zephyr.h>
#ifndef lint
--- 13,18 -----
#include <zephyr/mit-copyright.h>
#include <zephyr/zephyr.h>
#ifndef lint
diff -rc src/clients/zmailnotify/zmailnotify.c /source/athena/athena.lib/zephyr/clients/zmailnotify/zmailnotify.c
*** src/clients/zmailnotify/zmailnotify.c Fri Jun 8 16:07:42 1990
--- /source/athena/athena.lib/zephyr/clients/zmailnotify/zmailnotify.c Mon Nov 14 11:51:10 1988
***************
*** 22,30
#include <sys/uio.h>
#include <sys/wait.h>
#include <sys/socket.h>
- #ifdef macII
- #include <sys/types.h>
- #endif
#include <sys/file.h>
#ifndef macII
#include <ttyent.h>
--- 22,27 -----
#include <sys/uio.h>
#include <sys/wait.h>
#include <sys/socket.h>
#include <sys/file.h>
#include <ttyent.h>
#include <pwd.h>
***************
*** 26,32
#include <sys/types.h>
#endif
#include <sys/file.h>
- #ifndef macII
#include <ttyent.h>
#endif
#include <pwd.h>
--- 23,28 -----
#include <sys/wait.h>
#include <sys/socket.h>
#include <sys/file.h>
#include <ttyent.h>
#include <pwd.h>
#include <stdio.h>
***************
*** 28,34
#include <sys/file.h>
#ifndef macII
#include <ttyent.h>
- #endif
#include <pwd.h>
#include <stdio.h>
#include <sgtty.h>
--- 24,29 -----
#include <sys/socket.h>
#include <sys/file.h>
#include <ttyent.h>
#include <pwd.h>
#include <stdio.h>
#include <sgtty.h>
diff -rc src/clients/zstat/zstat.c /source/athena/athena.lib/zephyr/clients/zstat/zstat.c
*** src/clients/zstat/zstat.c Fri Jun 8 16:42:58 1990
--- /source/athena/athena.lib/zephyr/clients/zstat/zstat.c Tue Apr 4 11:26:35 1989
***************
*** 19,28
#include <stdio.h>
#include <string.h>
- #ifdef macII
- #include <time.h>
- #endif
-
#ifndef lint
#ifndef SABER
static char rcsid_zstat_c[] = "$Header: zstat.c,v 1.8 89/04/04 11:26:38 jtkohl Exp $";
--- 19,24 -----
#include <stdio.h>
#include <string.h>
#ifndef lint
#ifndef SABER
static char rcsid_zstat_c[] = "$Header: zstat.c,v 1.8 89/04/04 11:26:38 jtkohl Exp $";
diff -rc src/config/config.Imakefile /source/athena/athena.lib/zephyr/config/config.Imakefile
*** src/config/config.Imakefile Fri Jun 15 18:28:44 1990
--- /source/athena/athena.lib/zephyr/config/config.Imakefile Wed Apr 4 16:59:15 1990
***************
*** 15,21
/* XXX BEGIN LIKELY SITE-SPECIFIC CONFIGURATION XXX */
/* This should be set to the root of your Zephyr source tree */
! SRCTOP=/mnt/zephyr/src
/* IMAKE names the command to be used to build Makefiles from
Imakefiles. If you have Imake installed somewhere else,
--- 15,21 -----
/* XXX BEGIN LIKELY SITE-SPECIFIC CONFIGURATION XXX */
/* This should be set to the root of your Zephyr source tree */
! SRCTOP=/afs/athena.mit.edu/astaff/project/zephyr/src
/* IMAKE names the command to be used to build Makefiles from
Imakefiles. If you have Imake installed somewhere else,
***************
*** 27,33
/* For Ultrix version 2, put -DULTRIX22 on this line */
/* If your C Library doesn't have strcasecmp() and strncasecmp()
(case-insensitive string comparisons), put -DSTRCASE on this line */
! GLOBALCDEFS= -DmacII -DSYSV -DPOSIX -DBSD42 /* -DULTRIX22 */ /* -DSTRCASE */
/* OPTION SELECTION: */
--- 27,33 -----
/* For Ultrix version 2, put -DULTRIX22 on this line */
/* If your C Library doesn't have strcasecmp() and strncasecmp()
(case-insensitive string comparisons), put -DSTRCASE on this line */
! GLOBALCDEFS=/* -DULTRIX22 */ /* -DSTRCASE */
/* OPTION SELECTION: */
***************
*** 58,64
* Define PROFILED_LIBS if you want to build a profiled version of the
* Zephyr Library
*/
! /* #define PROFILED_LIBS */
/*
* Define PROF_FLAG to be the flag passed to your C compiler to turn
* on profiling. On BSD systems, -pg is probably superior to -p.
--- 58,64 -----
* Define PROFILED_LIBS if you want to build a profiled version of the
* Zephyr Library
*/
! #define PROFILED_LIBS
/*
* Define PROF_FLAG to be the flag passed to your C compiler to turn
* on profiling. On BSD systems, -pg is probably superior to -p.
***************
*** 66,72
* This is ignored unless PROFILED_LIBS is defined.
*/
/* #define PROF_FLAG -p */
! #define PROF_FLAG -p
/*
* Define LOCAL_LIBS if the libss and libcom_err libraries (and supporting
* include files) are not installed
--- 66,72 -----
* This is ignored unless PROFILED_LIBS is defined.
*/
/* #define PROF_FLAG -p */
! #define PROF_FLAG -pg
/*
* Define LOCAL_LIBS if the libss and libcom_err libraries (and supporting
* include files) are not installed
***************
*** 77,83
* search path. WARNING: not selecting this assumes you have the new
* versions of the libss & libcom_err support on your system!]
*/
! #define LOCAL_LIBS
/*
* Define LOCAL_makedepend if makedepend needs to be built before being
* used (e.g. if makedepend is not already installed on your system)
--- 77,83 -----
* search path. WARNING: not selecting this assumes you have the new
* versions of the libss & libcom_err support on your system!]
*/
! /* #define LOCAL_LIBS */
/*
* Define LOCAL_makedepend if makedepend needs to be built before being
* used (e.g. if makedepend is not already installed on your system)
***************
*** 167,173
#ifdef KERBEROS
KRB_CDEFS=-DKERBEROS
! KRB_LIB=/usr/athena/lib/libkrb.a
KRB_LINTLIB=-lkrb
DES_LIB=/usr/athena/lib/libdes.a
DES_LINTLIB=/usr/athena/lib/libdes.a
--- 167,173 -----
#ifdef KERBEROS
KRB_CDEFS=-DKERBEROS
! KRB_LIB=-lkrb
KRB_LINTLIB=-lkrb
DES_LIB=-ldes
DES_LINTLIB=-ldes
***************
*** 169,176
KRB_CDEFS=-DKERBEROS
KRB_LIB=/usr/athena/lib/libkrb.a
KRB_LINTLIB=-lkrb
! DES_LIB=/usr/athena/lib/libdes.a
! DES_LINTLIB=/usr/athena/lib/libdes.a
#else /* !KERBEROS */
KRB_CDEFS=
KRB_LIB=
--- 169,176 -----
KRB_CDEFS=-DKERBEROS
KRB_LIB=-lkrb
KRB_LINTLIB=-lkrb
! DES_LIB=-ldes
! DES_LINTLIB=-ldes
#else /* !KERBEROS */
KRB_CDEFS=
KRB_LIB=
***************
*** 181,187
#ifdef HESIOD
HES_CDEFS=-DHESIOD
! HES_LIB=/usr/athena/lib/libhesiod.a
HES_LINTLIB=-lhesiod
#else /* !HESIOD */
HES_CDEFS=
--- 181,187 -----
#ifdef HESIOD
HES_CDEFS=-DHESIOD
! HES_LIB=-lhesiod
HES_LINTLIB=-lhesiod
#else /* !HESIOD */
HES_CDEFS=
***************
*** 226,232
* The name of the program which makes dependencies
* If building it locally, make this $(BUILDTOP)/makedepend/makedepend
*/
- #define LOCAL_makedepend
#ifdef LOCAL_makedepend
DEPEND=$(BUILDTOP)/makedepend/makedepend
#else /* !LOCAL_makedepend */
--- 226,231 -----
* The name of the program which makes dependencies
* If building it locally, make this $(BUILDTOP)/makedepend/makedepend
*/
#ifdef LOCAL_makedepend
DEPEND=$(BUILDTOP)/makedepend/makedepend
#else /* !LOCAL_makedepend */
***************
*** 240,246
/*
* The name of another program needed to post-process the archive.
*/
! RANLIB= echo
/*
* Install commands: installs a file into the destination tree.
--- 239,245 -----
/*
* The name of another program needed to post-process the archive.
*/
! RANLIB= ranlib
/*
* Install commands: installs a file into the destination tree.
***************
*** 264,270
AS=as /* The name of the target's assembler */
! LINT=echo /* The name of `lint' */
CC=cc /* The name of the C compiler for the target */
--- 263,269 -----
AS=as /* The name of the target's assembler */
! LINT=lint /* The name of `lint' */
CC=cc /* The name of the C compiler for the target */
*** src/et/compile_et/compile_et.c Fri Jun 8 01:42:20 1990
--- /source/athena/athena.lib/zephyr/et/compile_et/compile_et.c Thu Oct 19 09:22:57 1989
***************
*** 9,17
*/
#include <stdio.h>
- #ifdef macII
- #include <sys/types.h>
- #endif
#include <sys/file.h>
#include <string.h>
#include <sys/param.h>
--- 9,14 -----
*/
#include <stdio.h>
#include <sys/file.h>
#include <string.h>
#include <sys/param.h>
diff -rc src/include/zephyr/zephyr_conf.h /source/athena/athena.lib/zephyr/include/zephyr/zephyr_conf.h
*** src/include/zephyr/zephyr_conf.h Fri Jun 8 15:45:14 1990
--- /source/athena/athena.lib/zephyr/include/zephyr/zephyr_conf.h Thu Mar 23 09:47:35 1989
***************
*** 59,69
#define FD_CLR(n, p) ((p)->fds_bits[0] &= ~(1 << (n)))
#endif /* ultrix */
- #ifdef macII
- #define FD_ZERO(p) ((p)->fds_bits[0] = 0)
- #define FD_SET(n, p) ((p)->fds_bits[0] |= (1 << (n)))
- #define FD_ISSET(n, p) ((p)->fds_bits[0] & (1 << (n)))
- #endif
#ifndef KERBEROS
#define REALM_SZ MAXHOSTNAMELEN
#define INST_SZ 0 /* no instances w/o Kerberos */
--- 59,64 -----
#define FD_CLR(n, p) ((p)->fds_bits[0] &= ~(1 << (n)))
#endif /* ultrix */
#ifndef KERBEROS
#define REALM_SZ MAXHOSTNAMELEN
#define INST_SZ 0 /* no instances w/o Kerberos */
diff -rc src/ozwgc/main.c /source/athena/athena.lib/zephyr/ozwgc/main.c
*** src/ozwgc/main.c Fri Jun 8 16:33:11 1990
--- /source/athena/athena.lib/zephyr/ozwgc/main.c Thu Jul 20 10:14:56 1989
***************
*** 46,54
#include "ropes.h"
#include "comp_types.h"
#include "support.h"
- #ifdef macII
- #define vfork fork
- #endif
int x_recent_error=0;
int logout_flag;
--- 46,51 -----
#include "ropes.h"
#include "comp_types.h"
#include "support.h"
int x_recent_error=0;
int logout_flag;
Common subdirectories: src/ozwgc/zbrowser and /source/athena/athena.lib/zephyr/ozwgc/zbrowser
diff -rc src/server/bdump.c /source/athena/athena.lib/zephyr/server/bdump.c
*** src/server/bdump.c Fri Jun 8 22:37:45 1990
--- /source/athena/athena.lib/zephyr/server/bdump.c Wed Jan 10 14:05:55 1990
***************
*** 24,34
#include <signal.h>
#include <sys/param.h> /* for BSD */
-
- #ifdef macII
- #define FD_CLR(n, p) ((p)->fds_bits[0] &= ~(1 << (n)))
- #endif
-
/*
* External functions are:
*
--- 24,29 -----
#include <signal.h>
#include <sys/param.h> /* for BSD */
/*
* External functions are:
*
diff -rc src/server/kstuff.c /source/athena/athena.lib/zephyr/server/kstuff.c
*** src/server/kstuff.c Fri Jun 8 22:21:21 1990
--- /source/athena/athena.lib/zephyr/server/kstuff.c Thu Mar 23 09:29:03 1989
***************
*** 22,31
#include <ctype.h>
#include <netdb.h>
- #ifdef macII
- #include <strings.h>
- #endif
-
char *index();
--- 22,27 -----
#include <ctype.h>
#include <netdb.h>
char *index();
diff -rc src/server/main.c /source/athena/athena.lib/zephyr/server/main.c
*** src/server/main.c Sat Jun 9 17:31:08 1990
--- /source/athena/athena.lib/zephyr/server/main.c Mon Oct 23 08:14:16 1989
***************
*** 184,190
if (chdir("/usr/tmp") != 0)
syslog(LOG_ERR,"chdir failed (%m) (execution continuing)");
- #ifndef macII
if (setpriority(PRIO_PROCESS, getpid(), -10))
syslog(LOG_ERR,"setpriority failed (%m)");
#else
--- 184,189 -----
if (chdir("/usr/tmp") != 0)
syslog(LOG_ERR,"chdir failed (%m) (execution continuing)");
if (setpriority(PRIO_PROCESS, getpid(), -10))
syslog(LOG_ERR,"setpriority failed (%m)");
***************
*** 187,195
#ifndef macII
if (setpriority(PRIO_PROCESS, getpid(), -10))
syslog(LOG_ERR,"setpriority failed (%m)");
- #else
- /* A/UX does not support this....the closest can be done with nice*/
- #endif
FD_ZERO(&interesting);
FD_SET(srv_socket, &interesting);
--- 186,191 -----
if (setpriority(PRIO_PROCESS, getpid(), -10))
syslog(LOG_ERR,"setpriority failed (%m)");
FD_ZERO(&interesting);
FD_SET(srv_socket, &interesting);
diff -rc src/server/subscr.c /source/athena/athena.lib/zephyr/server/subscr.c
*** src/server/subscr.c Fri Jun 8 22:22:43 1990
--- /source/athena/athena.lib/zephyr/server/subscr.c Wed Jan 10 11:39:18 1990
***************
*** 77,86
extern int new_compat_count_subscr; /* counter of old use */
#endif /* NEW_COMPAT */
- #ifdef macII
- #include <strings.h>
- #endif
-
extern char *re_comp(), *re_conv(), *rindex(), *index();
static ZSubscr_t *extract_subscriptions();
static int subscr_equiv(), clt_unique();
--- 77,82 -----
extern int new_compat_count_subscr; /* counter of old use */
#endif /* NEW_COMPAT */
extern char *re_comp(), *re_conv(), *rindex(), *index();
static ZSubscr_t *extract_subscriptions();
static int subscr_equiv(), clt_unique();
diff -rc src/ss/lib/help.c /source/athena/athena.lib/zephyr/ss/lib/help.c
*** src/ss/lib/help.c Fri Jun 8 14:53:41 1990
--- /source/athena/athena.lib/zephyr/ss/lib/help.c Tue May 30 22:55:02 1989
***************
*** 5,13
*/
#include <sys/param.h>
- #ifdef macII
- #include <sys/types.h>
- #endif
#include <sys/file.h>
#include <sys/wait.h>
#include "ss_internal.h"
--- 5,10 -----
*/
#include <sys/param.h>
#include <sys/file.h>
#include <sys/wait.h>
#include "ss_internal.h"
diff -rc src/ss/lib/pager.c /source/athena/athena.lib/zephyr/ss/lib/pager.c
*** src/ss/lib/pager.c Fri Jun 8 14:54:58 1990
--- /source/athena/athena.lib/zephyr/ss/lib/pager.c Tue May 30 22:55:06 1989
***************
*** 10,18
#include "ss_internal.h"
#include "copyright.h"
#include <stdio.h>
- #ifdef macII
- #include <sys/types.h>
- #endif
#include <sys/file.h>
#include <signal.h>
--- 10,15 -----
#include "ss_internal.h"
#include "copyright.h"
#include <stdio.h>
#include <sys/file.h>
#include <signal.h>
diff -rc src/ss/make_commands/mk_cmds.c /source/athena/athena.lib/zephyr/ss/make_commands/mk_cmds.c
*** src/ss/make_commands/mk_cmds.c Fri Jun 8 23:30:40 1990
--- /source/athena/athena.lib/zephyr/ss/make_commands/mk_cmds.c Tue May 30 23:17:38 1989
***************
*** 12,20
#include "copyright.h"
#include <stdio.h>
#include <sys/param.h>
- #ifdef macII
- #include <sys/types.h>
- #endif
#include <sys/file.h>
#include <strings.h>
#include "ss_internal.h"
--- 12,17 -----
#include "copyright.h"
#include <stdio.h>
#include <sys/param.h>
#include <sys/file.h>
#include <strings.h>
#include "ss_internal.h"
diff -rc src/zhm/zhm.c /source/athena/athena.lib/zephyr/zhm/zhm.c
*** src/zhm/zhm.c Fri Jun 8 16:59:04 1990
--- /source/athena/athena.lib/zephyr/zhm/zhm.c Fri Feb 9 17:10:13 1990
***************
*** 25,34
*/
#include <sys/param.h>
- #ifdef macII
- #define srandom srand48
- #endif
-
#ifdef HESIOD
#include <hesiod.h>
#endif HESIOD
--- 25,30 -----
*/
#include <sys/param.h>
#ifdef HESIOD
#include <hesiod.h>
#endif HESIOD
Common subdirectories: src/zwgc/Dictionary and /source/athena/athena.lib/zephyr/zwgc/Dictionary
diff -rc src/zwgc/Imakefile /source/athena/athena.lib/zephyr/zwgc/Imakefile
*** src/zwgc/Imakefile Fri Jun 8 22:01:32 1990
--- /source/athena/athena.lib/zephyr/zwgc/Imakefile Thu Apr 12 23:18:21 1990
***************
*** 9,15
/**/#
SUBDIRS= Memory String Dictionary
! LIBS = $(X11_LIB) $(ZEPHYR_LIB) $(KRB_LIB) $(DES_LIB) $(COMERR_LIB) -ltermcap -lc -lPW
LINTLIBS = $(X11_LINTLIB) $(ZEPHYR_LINTLIB) $(KRB_LINTLIB) $(DES_LINTLIB) \
$(COMERR_LINTLIB) -ltermcap
SRCS = parser.y lexer.c node.c exec.c buffer.c main.c zephyr.c X_driver.c\
--- 9,15 -----
/**/#
SUBDIRS= Memory String Dictionary
! LIBS = $(X11_LIB) $(ZEPHYR_LIB) $(KRB_LIB) $(DES_LIB) $(COMERR_LIB) -ltermcap
LINTLIBS = $(X11_LINTLIB) $(ZEPHYR_LINTLIB) $(KRB_LINTLIB) $(DES_LINTLIB) \
$(COMERR_LINTLIB) -ltermcap
SRCS = parser.y lexer.c node.c exec.c buffer.c main.c zephyr.c X_driver.c\
diff -rc src/zwgc/mux.c /source/athena/athena.lib/zephyr/zwgc/mux.c
*** src/zwgc/mux.c Fri Jun 8 17:32:57 1990
--- /source/athena/athena.lib/zephyr/zwgc/mux.c Thu Dec 7 17:34:59 1989
***************
*** 33,45
#include "zwgc.h"
#include "pointer.h"
-
- #ifdef macII
- #define FD_ZERO(p) ((p)->fds_bits[0] = 0)
- #define FD_SET(n, p) ((p)->fds_bits[0] |= (1 << (n)))
- #define FD_ISSET(n, p) ((p)->fds_bits[0] & (1 << (n)))
- #endif
-
/*
* mux_end_loop_p - Setting this to true during a mux_loop causes the mux_loop
* to be exited.
--- 33,38 -----
#include "zwgc.h"
#include "pointer.h"
/*
* mux_end_loop_p - Setting this to true during a mux_loop causes the mux_loop
* to be exited.
diff -rc src/zwgc/regexp.c /source/athena/athena.lib/zephyr/zwgc/regexp.c
*** src/zwgc/regexp.c Fri Jun 8 22:05:06 1990
--- /source/athena/athena.lib/zephyr/zwgc/regexp.c Thu Dec 7 17:35:07 1989
***************
*** 21,27
#include <stdio.h>
#include "regexp.h"
- #ifndef macII
extern char *re_comp();
extern int re_exec();
#endif
--- 21,26 -----
#include <stdio.h>
#include "regexp.h"
extern char *re_comp();
extern int re_exec();
***************
*** 24,62
#ifndef macII
extern char *re_comp();
extern int re_exec();
- #endif
-
- #ifdef macII
- char *re_comp();
- int re_exec();
- #endif
-
- #ifdef macII
- static char *re = (char *) 0;
-
- char *re_comp(s)
- char *s;
- {
- if (!s) return ((char *)0);
-
- if (re) free(re);
-
- re = regcmp(s, (char *)0);
- if (!re) return ("Bad argument to re_comp.");
-
- return (0); /* Success! */
- }
-
- int re_exec(s)
- char *s;
- {
- char *result = regex(re, s);
-
- if (!result) return (0);
-
- return (1);
- }
- #endif
int ed_regexp_match_p(test_string, pattern)
string test_string;
--- 23,28 -----
extern char *re_comp();
extern int re_exec();
int ed_regexp_match_p(test_string, pattern)
string test_string;
diff -rc src/zwgc/ulong.h /source/athena/athena.lib/zephyr/zwgc/ulong.h
*** src/zwgc/ulong.h Fri Jun 8 17:26:28 1990
--- /source/athena/athena.lib/zephyr/zwgc/ulong.h Thu Dec 7 17:35:14 1989
***************
*** 19,29
#ifndef ulong_MODULE
#define ulong_MODULE
- #ifdef macII
- #include <sys/types.h>
- #endif
-
- #ifndef macII
typedef unsigned long ulong;
#endif
#endif
--- 19,24 -----
#ifndef ulong_MODULE
#define ulong_MODULE
typedef unsigned long ulong;
#endif
***************
*** 25,29
#ifndef macII
typedef unsigned long ulong;
! #endif
#endif
--- 20,24 -----
#define ulong_MODULE
typedef unsigned long ulong;
!
#endif
diff -rc src/zwgc/xmark.c /source/athena/athena.lib/zephyr/zwgc/xmark.c
*** src/zwgc/xmark.c Fri Jun 8 17:15:24 1990
--- /source/athena/athena.lib/zephyr/zwgc/xmark.c Thu Dec 7 17:35:17 1989
***************
*** 26,35
#include "new_string.h"
#include <stdio.h>
- #ifdef macII
- #include <strings.h>
- #endif
-
int markblock[3] = { -1 , -1 , -1 };
int markchar[3] = { -1 , -1 , -1 };
int markpixel[3] = { -1 , -1 , -1 };
--- 26,31 -----
#include "new_string.h"
#include <stdio.h>
int markblock[3] = { -1 , -1 , -1 };
int markchar[3] = { -1 , -1 , -1 };
int markpixel[3] = { -1 , -1 , -1 };
***************
