projects / unix-history / blame
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
BSD 4_4_Lite2 development
[unix-history] / usr / src / contrib / X11R5-hp300 / hpbsd.diffs
CommitLineData
0e808057
C		 1diff -cr ../X11R5.pure/mit/clients/twm/lex.l mit/clients/twm/lex.l
2*** ../X11R5.pure/mit/clients/twm/lex.l Sat Dec 16 08:02:02 1989
3--- mit/clients/twm/lex.l Sun Jun 6 11:10:17 1993
4***************
5*** 43,48 ****
6--- 43,67 ----
7
8 extern int ParseError;
9
10+ #ifdef FLEX_SCANNER
11+ #undef YY_INPUT
12+ #define YY_INPUT(buf,result,size) ((result) = doinput((buf),(size)))
13+ doinput (buf, size)
14+ char *buf;
15+ {
16+ int c;
17+
18+ if (size == 0)
19+ return (0);
20+
21+ if ((c = (*twmInputFunc)()) <= 0)
22+ return (0);
23+
24+ buf[0] = c;
25+ return (1);
26+ }
27+ #endif
28+
29 %}
30
31 string \"([^"]|\\.)*\"
32***************
33*** 89,94 ****
34--- 108,116 ----
35 %%
36 yywrap() { return(1);}
37
38+ #ifdef FLEX_SCANNER
39+ int yylineno;
40+ #else
41 #undef unput
42 #undef input
43 #undef output
44***************
45*** 97,99 ****
46--- 119,122 ----
47 #define input() (*twmInputFunc)()
48 #define output(c) TwmOutput(c)
49 #define feof() (1)
50+ #endif
51diff -cr ../X11R5.pure/mit/clients/xdm/dm.h mit/clients/xdm/dm.h
52*** ../X11R5.pure/mit/clients/xdm/dm.h Fri May 28 18:10:30 1993
53--- mit/clients/xdm/dm.h Sun Jun 6 11:19:29 1993
54***************
55*** 56,63 ****
56--- 56,65 ----
57 #endif
58 #ifndef NGROUPS_MAX
59 # include <sys/param.h>
60+ #ifndef NGROUPS_MAX
61 #ifdef NGROUPS
62 #define NGROUPS_MAX NGROUPS
63+ #endif
64 #endif
65 #endif
66
67diff -cr ../X11R5.pure/mit/clients/xdm/xdmshell.c mit/clients/xdm/xdmshell.c
68*** ../X11R5.pure/mit/clients/xdm/xdmshell.c Fri Jul 19 10:56:13 1991
69--- mit/clients/xdm/xdmshell.c Sun Jun 6 11:10:17 1993
70***************
71*** 36,42 ****
72 #include <errno.h>
73 extern int errno;
74 extern int sys_nerr;
75- extern char *sys_errlist[];
76
77 #ifdef macII
78 #define ON_CONSOLE_ONLY
79--- 36,41 ----
80***************
81*** 62,67 ****
82--- 61,67 ----
83 static char *SysErrorMsg (n)
84 int n;
85 {
86+ extern char *sys_errlist[];
87 char *s = (n > 0 && n < sys_nerr) ? sys_errlist[n] : "unknown";
88 return (s ? s : "null system error");
89 }
90diff -cr ../X11R5.pure/mit/clients/xload/Imakefile mit/clients/xload/Imakefile
91*** ../X11R5.pure/mit/clients/xload/Imakefile Wed Jul 17 16:46:31 1991
92--- mit/clients/xload/Imakefile Sun Jun 6 11:10:18 1993
93***************
94*** 4,9 ****
95--- 4,13 ----
96 #if defined(SunArchitecture) && defined(i386Architecture)
97 SYS_LIBRARIES = -lkvm
98 #endif
99+ #ifdef BSD44
100+ SYS_LIBRARIES = -lutil -lkvm
101+ EXTRA_DEFINES = -DUSE_GETLOADAVG
102+ #endif
103 #if SystemV4
104 #ifdef SonyArchitecture
105 SYS_LIBRARIES = -lmld
106diff -cr ../X11R5.pure/mit/clients/xload/get_load.c mit/clients/xload/get_load.c
107*** ../X11R5.pure/mit/clients/xload/get_load.c Fri Jul 26 06:21:17 1991
108--- mit/clients/xload/get_load.c Sun Jun 6 11:10:18 1993
109***************
110*** 114,119 ****
111--- 114,123 ----
112 #endif
113 #endif
114
115+ #ifdef hp9000
116+ #include <sys/param.h>
117+ #endif
118+
119 #ifdef X_NOT_POSIX
120 extern long lseek();
121 #endif
122***************
123*** 182,187 ****
124--- 186,209 ----
125 lastNullCpu = info.cpu_total.low32;
126 }
127 #else /* not apollo */
128+ #if defined(USE_GETLOADAVG)
129+
130+ void InitLoadPoint() /* getloadavg() library version */
131+ {
132+ }
133+
134+ /* ARGSUSED */
135+ void GetLoadPoint( w, closure, call_data ) /* getloadavg() library version */
136+ Widget w; /* unused */
137+ caddr_t closure; /* unused */
138+ caddr_t call_data; /* pointer to (double) return value */
139+ {
140+ double *loadavg = (double *)call_data;
141+ if (getloadavg(loadavg, 1) != 1)
142+ *loadavg = 1.0;
143+ }
144+
145+ #else /* not USE_GETLOADAVG */
146 #if defined(SYSV) && defined(SYSV386)
147 /*
148 * inspired by 'avgload' by John F. Haugh II
149***************
150*** 561,567 ****
151 (void) lseek(kmem, loadavg_seek, 0);
152 #endif
153
154! #if defined(sun) || defined (UTEK) || defined(sequent) || defined(alliant) || defined(SVR4) || defined(sgi) || defined(hcx)
155 {
156 long temp;
157 (void) read(kmem, (char *)&temp, sizeof(long));
158--- 583,589 ----
159 (void) lseek(kmem, loadavg_seek, 0);
160 #endif
161
162! #if defined(sun) || defined (UTEK) || defined(sequent) || defined(alliant) || defined(SVR4) || defined(sgi) || defined(hcx) || defined(hp9000)
163 {
164 long temp;
165 (void) read(kmem, (char *)&temp, sizeof(long));
166***************
167*** 712,717 ****
168--- 734,740 ----
169 #endif /* LOADSTUB else */
170 #endif /* KVM_ROUTINES else */
171 #endif /* SYSV && SYSV386 else */
172+ #endif /* USE_GETLOADAVG */
173
174 static xload_error(str1, str2)
175 char *str1, *str2;
176diff -cr ../X11R5.pure/mit/clients/xman/Imakefile mit/clients/xman/Imakefile
177*** ../X11R5.pure/mit/clients/xman/Imakefile Fri May 28 18:08:17 1993
178--- mit/clients/xman/Imakefile Sun Jun 6 11:10:18 1993
179***************
180*** 10,17 ****
181 #endif
182 MANPATHS = $(SYSMANPATH) $(LOCALMANPATH)
183 HELPFILE = -DHELPFILE=\"$(LIBDIR)$(PATHSEP)xman.help\"
184
185! DEFINES = $(HELPFILE) $(MANPATHS)
186 DEPLIBS = XawClientDepLibs
187 LOCAL_LIBRARIES = XawClientLibs
188 SRCS = ScrollByL.c handler.c man.c buttons.c help.c \
189--- 10,20 ----
190 #endif
191 MANPATHS = $(SYSMANPATH) $(LOCALMANPATH)
192 HELPFILE = -DHELPFILE=\"$(LIBDIR)$(PATHSEP)xman.help\"
193+ #if BSD44
194+ BSD44MAN = -DBSD44MAN
195+ #endif
196
197! DEFINES = $(HELPFILE) $(MANPATHS) $(BSD44MAN)
198 DEPLIBS = XawClientDepLibs
199 LOCAL_LIBRARIES = XawClientLibs
200 SRCS = ScrollByL.c handler.c man.c buttons.c help.c \
201diff -cr ../X11R5.pure/mit/clients/xman/vendor.h mit/clients/xman/vendor.h
202*** ../X11R5.pure/mit/clients/xman/vendor.h Wed Aug 21 06:49:23 1991
203--- mit/clients/xman/vendor.h Sun Jun 6 11:10:19 1993
204***************
205*** 29,35 ****
206 * complete than the cat directories.
207 */
208
209! #if ( defined(UTEK) || defined(apollo) )
210 # define SEARCHDIR CAT
211 #else
212 # define SEARCHDIR MAN
213--- 29,35 ----
214 * complete than the cat directories.
215 */
216
217! #if ( defined(UTEK) || defined(apollo) || defined(BSD44MAN) )
218 # define SEARCHDIR CAT
219 #else
220 # define SEARCHDIR MAN
221***************
222*** 62,67 ****
223--- 62,70 ----
224 #ifdef sgi
225 # define SYSMANPATH "/usr/catman/a_man:/usr/catman/g_man:/usr/catman/p_man:/usr/catman/u_man:/usr/man/p_man:/usr/man/u_man:/usr/man"
226 #endif /* sgi */
227+ #ifdef BSD44MAN
228+ # define SYSMANPATH "/usr/share/man:/usr/share/man/old:/usr/contrib/man:/usr/local/man"
229+ #endif
230
231 #ifndef SYSMANPATH
232 # define SYSMANPATH "/usr/man"
233diff -cr ../X11R5.pure/mit/clients/xset/xset.c mit/clients/xset/xset.c
234*** ../X11R5.pure/mit/clients/xset/xset.c Tue Jul 23 10:32:47 1991
235--- mit/clients/xset/xset.c Sun Jun 6 11:10:19 1993
236***************
237*** 33,38 ****
238--- 33,43 ----
239 #include <X11/extensions/MITMisc.h>
240 #endif
241
242+ #ifdef _BSD_RUNE_T_
243+ /* override clash with bsd44 ctype.h macro */
244+ #undef isnumber
245+ #endif
246+
247 #define ON 1
248 #define OFF 0
249
250diff -cr ../X11R5.pure/mit/clients/xterm/main.c mit/clients/xterm/main.c
251*** ../X11R5.pure/mit/clients/xterm/main.c Fri May 28 18:46:35 1993
252--- mit/clients/xterm/main.c Sun Jun 6 11:21:24 1993
253***************
254*** 142,147 ****
255--- 142,149 ----
256 #include <sys/resource.h>
257 #endif
258 #ifdef hpux
259+ #define USE_SYSV_UTMP
260+ #define HAS_UTMP_UT_HOST
261 #define HAS_BSD_GROUPS
262 #include <sys/ptyio.h>
263 #endif /* hpux */
264***************
265*** 177,186 ****
266 #endif /* apollo */
267
268 #include <utmp.h>
269 #ifdef LASTLOG
270 #include <lastlog.h>
271 #endif
272! #include <sys/param.h> /* for NOFILE */
273
274 #ifdef PUCC_PTYD
275 #include <local/openpty.h>
276--- 179,190 ----
277 #endif /* apollo */
278
279 #include <utmp.h>
280+ #include <sys/param.h> /* for NOFILE */
281 #ifdef LASTLOG
282+ #if !defined(BSD4_4)
283 #include <lastlog.h>
284 #endif
285! #endif
286
287 #ifdef PUCC_PTYD
288 #include <local/openpty.h>
289***************
290*** 192,203 ****
291--- 196,218 ----
292 #endif
293
294 #ifndef UTMP_FILENAME
295+ #ifdef _PATH_UTMP
296+ #define UTMP_FILENAME _PATH_UTMP
297+ #else
298 #define UTMP_FILENAME "/etc/utmp"
299 #endif
300+ #endif
301 #ifndef LASTLOG_FILENAME
302+ #ifdef _PATH_LASTLOG
303+ #define LASTLOG_FILENAME _PATH_LASTLOG
304+ #else
305 #define LASTLOG_FILENAME "/usr/adm/lastlog" /* only on BSD systems */
306 #endif
307+ #endif
308 #ifndef WTMP_FILENAME
309+ #ifdef _PATH_WTMP
310+ #define WTMP_FILENAME _PATH_WTMP
311+ #else
312 #if defined(SYSV)
313 #define WTMP_FILENAME "/etc/wtmp"
314 #else
315***************
316*** 204,209 ****
317--- 219,225 ----
318 #define WTMP_FILENAME "/usr/adm/wtmp"
319 #endif
320 #endif
321+ #endif
322
323 #include <signal.h>
324
325***************
326*** 390,396 ****
327--- 406,416 ----
328 */
329 #ifdef USE_LOGIN_DASH_P
330 #ifndef LOGIN_FILENAME
331+ #if defined(BSD4_4)
332+ #define LOGIN_FILENAME "/usr/bin/login"
333+ #else
334 #define LOGIN_FILENAME "/bin/login"
335+ #endif
336 #endif
337 static char bin_login[] = LOGIN_FILENAME;
338 #endif
339Common subdirectories: ../X11R5.pure/mit/clients/xterm/tektests and mit/clients/xterm/tektests
340diff -cr ../X11R5.pure/mit/config/Imake.tmpl mit/config/Imake.tmpl
341*** ../X11R5.pure/mit/config/Imake.tmpl Fri May 28 18:10:24 1993
342--- mit/config/Imake.tmpl Sun Jun 6 11:22:55 1993
343***************
344*** 77,82 ****
345--- 77,89 ----
346 #define HPArchitecture
347 #endif /* hpux */
348
349+ #ifdef hp9000
350+ #define MacroIncludeFile <hpbsd.cf>
351+ #define MacroFile hpbsd.cf
352+ #undef hp9000
353+ #define HPBSDArchitecture
354+ #endif /* hp9000 */
355+
356 #ifdef att
357 #define MacroIncludeFile <att.cf>
358 #define MacroFile att.cf
359***************
360*** 182,187 ****
361--- 189,201 ----
362 #define RsArchitecture
363 #endif
364 #endif /* ibm */
365+
366+ #ifdef SOL
367+ #undef luna
368+ #define MacroIncludeFile <sol.cf>
369+ #define MacroFile sol.cf
370+ #define Mc68000Architecture
371+ #endif
372
373 #ifdef luna
374 #undef luna
375diff -cr ../X11R5.pure/mit/config/imake.c mit/config/imake.c
376*** ../X11R5.pure/mit/config/imake.c Fri Jul 26 09:51:12 1991
377--- mit/config/imake.c Sun Jun 6 11:10:21 1993
378***************
379*** 107,114 ****
380--- 107,120 ----
381 #ifdef X_NOT_POSIX
382 #include <sys/file.h>
383 #else
384+ #if defined(hp9000) || defined(luna68k)
385+ #undef _POSIX_SOURCE
386+ #endif
387 #include <unistd.h>
388+ #if defined(hp9000) || defined(luna68k)
389+ #define _POSIX_SOURCE
390 #endif
391+ #endif
392 #if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
393 #include <signal.h>
394 #else
395***************
396*** 211,217 ****
397--- 217,227 ----
398 char *ReadLine();
399 char *CleanCppInput();
400 char *Strdup();
401+ #if defined(__STDC__) || defined(__GNUC__)
402+ char *Emalloc(int);
403+ #else
404 char *Emalloc();
405+ #endif
406
407 boolean verbose = FALSE;
408 boolean show = TRUE;
409diff -cr ../X11R5.pure/mit/config/imakemdep.h mit/config/imakemdep.h
410*** ../X11R5.pure/mit/config/imakemdep.h Mon Aug 26 07:39:59 1991
411--- mit/config/imakemdep.h Sun Jun 6 11:26:21 1993
412***************
413*** 126,131 ****
414--- 126,134 ----
415 #if defined(_IBMR2) && !defined(DEFAULT_CPP)
416 #define DEFAULT_CPP "/usr/lpp/X11/Xamples/util/cpp/cpp"
417 #endif
418+ #if (defined(hp9000) || defined(luna68k)) && !defined(DEFAULT_CPP)
419+ #define DEFAULT_CPP "/usr/libexec/cpp"
420+ #endif
421
422 /*
423 * Step 5: cpp_argv
424***************
425*** 156,161 ****
426--- 159,167 ----
427 #ifdef unix
428 "-Uunix", /* remove unix symbol so that filename unix.c okay */
429 #endif
430+ #if defined(hp9000) || defined(luna68k)
431+ "-traditional",
432+ #endif
433 #ifdef M4330
434 "-DM4330", /* Tektronix */
435 #endif
436***************
437*** 272,277 ****
438--- 278,286 ----
439 #ifdef hpux
440 {"hpux", "1"},
441 #endif
442+ #ifdef hp9000
443+ {"hp9000", "1"},
444+ #endif
445 #ifdef vax
446 {"vax", "1"},
447 #endif
448***************
449*** 321,326 ****
450--- 330,338 ----
451 #endif
452 #ifdef luna2
453 {"luna2", "1"},
454+ #endif
455+ #ifdef luna68k
456+ {"luna68k", "1"},
457 #endif
458 #ifdef luna88k
459 {"luna88k", "1"},
460diff -cr ../X11R5.pure/mit/demos/x11perf/x11perf.c mit/demos/x11perf/x11perf.c
461*** ../X11R5.pure/mit/demos/x11perf/x11perf.c Sat Jul 27 13:07:54 1991
462--- mit/demos/x11perf/x11perf.c Sun Jun 6 11:10:21 1993
463***************
464*** 781,788 ****
465 int k = j;
466 do {
467 doit[k] = True;
468! } while (strcmp(cp2, (test[k].option + 1)) != 0 &&
469! (test[k].versions & xparms.version) &&
470 test[++k].option != NULL);
471 if (*cp2 != '-' && test[k].option == NULL)
472 usage();
473--- 781,788 ----
474 int k = j;
475 do {
476 doit[k] = True;
477! } while (!(strcmp(cp2, (test[k].option + 1)) == 0 &&
478! (test[k].versions & xparms.version)) &&
479 test[++k].option != NULL);
480 if (*cp2 != '-' && test[k].option == NULL)
481 usage();
482diff -cr ../X11R5.pure/mit/demos/xgc/lex.l mit/demos/xgc/lex.l
483*** ../X11R5.pure/mit/demos/xgc/lex.l Sat Jul 22 05:01:33 1989
484--- mit/demos/xgc/lex.l Sun Jun 6 11:10:22 1993
485***************
486*** 10,15 ****
487--- 10,18 ----
488 #include "gram.h"
489 #include "constants.h"
490
491+ #ifdef FLEX_SCANNER
492+ int yylineno;
493+ #endif
494 %}
495
496 %p 4000
497diff -cr ../X11R5.pure/mit/extensions/server/xinput/xexevents.c mit/extensions/server/xinput/xexevents.c
498*** ../X11R5.pure/mit/extensions/server/xinput/xexevents.c Thu Jul 25 07:48:38 1991
499--- mit/extensions/server/xinput/xexevents.c Sun Jun 6 11:10:22 1993
500***************
501*** 733,738 ****
502--- 733,739 ----
503 XID id;
504 {
505 register InputClientsPtr other, prev;
506+ extern int RT_INPUTCLIENT;
507 if (!wOtherInputMasks(pWin))
508 return(Success);
509 prev = 0;
510diff -cr ../X11R5.pure/mit/fonts/clients/mkfontdir/mkfontdir.c mit/fonts/clients/mkfontdir/mkfontdir.c
511*** ../X11R5.pure/mit/fonts/clients/mkfontdir/mkfontdir.c Wed Jul 17 12:33:46 1991
512--- mit/fonts/clients/mkfontdir/mkfontdir.c Sun Jun 6 11:29:53 1993
513***************
514*** 39,48 ****
515--- 39,50 ----
516 #endif
517 #ifndef PATH_MAX
518 #include <sys/param.h>
519+ #ifndef PATH_MAX
520 #ifdef MAXPATHLEN
521 #define PATH_MAX MAXPATHLEN
522 #else
523 #define PATH_MAX 1024
524+ #endif
525 #endif
526 #endif
527
528diff -cr ../X11R5.pure/mit/lib/X/XConnDis.c mit/lib/X/XConnDis.c
529*** ../X11R5.pure/mit/lib/X/XConnDis.c Fri May 28 19:59:32 1993
530--- mit/lib/X/XConnDis.c Sun Jun 6 11:10:23 1993
531***************
532*** 452,458 ****
533--- 452,462 ----
534 sprintf (unaddr.sun_path, "%s%d", X_UNIX_PATH, idisplay);
535
536 addr = (struct sockaddr *) &unaddr;
537+ #ifdef SUN_LEN
538+ addrlen = SUN_LEN(&unaddr);
539+ #else
540 addrlen = strlen(unaddr.sun_path) + sizeof(unaddr.sun_family);
541+ #endif
542
543 #ifdef hpux /* this is disgusting */
544 ounaddr.sun_family = AF_UNIX;
545diff -cr ../X11R5.pure/mit/lib/X/Xsi/XlcLoad.c mit/lib/X/Xsi/XlcLoad.c
546*** ../X11R5.pure/mit/lib/X/Xsi/XlcLoad.c Fri May 28 20:08:39 1993
547--- mit/lib/X/Xsi/XlcLoad.c Sun Jun 6 11:10:24 1993
548***************
549*** 111,116 ****
550--- 111,121 ----
551 }
552 }
553
554+ #ifdef _FSTDIO
555+ /* do not conflict with fgetline in bsd stdio */
556+ #define fgetline fgetlineX
557+ #endif
558+
559 static char *
560 fgetline(buf, len, fp)
561 char *buf;
562diff -cr ../X11R5.pure/mit/lib/Xaw/AsciiSrc.c mit/lib/Xaw/AsciiSrc.c
563*** ../X11R5.pure/mit/lib/Xaw/AsciiSrc.c Fri Jul 26 10:10:21 1991
564--- mit/lib/Xaw/AsciiSrc.c Sun Jun 6 11:10:24 1993
565***************
566*** 92,98 ****
567 static String MyStrncpy(), StorePiecesInString();
568 static Boolean SetValues(), WriteToFile();
569 extern int errno, sys_nerr;
570- extern char* sys_errlist[];
571
572 #define superclass (&textSrcClassRec)
573 AsciiSrcClassRec asciiSrcClassRec = {
574--- 92,97 ----
575***************
576*** 989,994 ****
577--- 988,994 ----
578 String params[2];
579 Cardinal num_params = 2;
580 char msg[11];
581+ extern char* sys_errlist[];
582
583 params[0] = src->ascii_src.string;
584 if (errno <= sys_nerr)
585diff -cr ../X11R5.pure/mit/lib/Xaw/TextPop.c mit/lib/Xaw/TextPop.c
586*** ../X11R5.pure/mit/lib/Xaw/TextPop.c Fri Jul 26 10:11:11 1991
587--- mit/lib/Xaw/TextPop.c Sun Jun 6 11:10:25 1993
588***************
589*** 61,67 ****
590 #include <errno.h>
591
592 extern int errno, sys_nerr;
593- extern char* sys_errlist[];
594
595 #define INSERT_FILE ("Enter Filename:")
596
597--- 61,66 ----
598***************
599*** 226,231 ****
600--- 225,231 ----
601 TextWidget ctx = (TextWidget) closure;
602 char buf[BUFSIZ], msg[BUFSIZ];
603 Widget temp_widget;
604+ extern char* sys_errlist[];
605
606 sprintf(buf, "%s.%s", FORM_NAME, TEXT_NAME);
607 if ( (temp_widget = XtNameToWidget(ctx->text.file_insert, buf)) == NULL ) {
608diff -cr ../X11R5.pure/mit/lib/Xmu/LocBitmap.c mit/lib/Xmu/LocBitmap.c
609*** ../X11R5.pure/mit/lib/Xmu/LocBitmap.c Wed Jul 3 01:10:42 1991
610--- mit/lib/Xmu/LocBitmap.c Sun Jun 6 11:31:12 1993
611***************
612*** 40,49 ****
613--- 40,51 ----
614 #endif /* X_NOT_POSIX */
615 #ifndef PATH_MAX
616 #include <sys/param.h>
617+ #ifndef PATH_MAX
618 #ifdef MAXPATHLEN
619 #define PATH_MAX MAXPATHLEN
620 #else
621 #define PATH_MAX 1024
622+ #endif
623 #endif
624 #endif /* PATH_MAX */
625
626diff -cr ../X11R5.pure/mit/rgb/Imakefile mit/rgb/Imakefile
627*** ../X11R5.pure/mit/rgb/Imakefile Fri May 28 18:08:22 1993
628--- mit/rgb/Imakefile Sun Jun 6 11:10:25 1993
629***************
630*** 12,20 ****
631 SRCS = $(SRCS1) $(SRCS2)
632 OBJS = $(OBJS1) $(OBJS2)
633 PROGRAMS = rgb showrgb
634 DATAFILES = rgb.pag rgb.dir
635 DATADEP = rgb.dir /* just want one run of rgb */
636! #if !(defined(SGIArchitecture) || SystemV4)
637 DBMLIB = -ldbm
638 #endif
639 #if defined(SparcArchitecture) && HasGcc
640--- 12,25 ----
641 SRCS = $(SRCS1) $(SRCS2)
642 OBJS = $(OBJS1) $(OBJS2)
643 PROGRAMS = rgb showrgb
644+ #if HasDB
645+ DATAFILES = rgb.db
646+ DATADEP = rgb.db
647+ #else
648 DATAFILES = rgb.pag rgb.dir
649 DATADEP = rgb.dir /* just want one run of rgb */
650! #endif
651! #if !(defined(SGIArchitecture) || SystemV4 || HasDB)
652 DBMLIB = -ldbm
653 #endif
654 #if defined(SparcArchitecture) && HasGcc
655diff -cr ../X11R5.pure/mit/rgb/rgb.c mit/rgb/rgb.c
656*** ../X11R5.pure/mit/rgb/rgb.c Mon Jul 1 08:39:37 1991
657--- mit/rgb/rgb.c Sun Jun 6 11:10:26 1993
658***************
659*** 31,42 ****
660 #include <errno.h>
661 extern int errno; /* some systems are still stupid */
662 extern int sys_nerr;
663- extern char *sys_errlist[];
664
665 char *ProgramName;
666
667 char *SysError ()
668 {
669 return ((errno >= 0 && errno < sys_nerr) ? sys_errlist[errno] : "?");
670 }
671
672--- 31,42 ----
673 #include <errno.h>
674 extern int errno; /* some systems are still stupid */
675 extern int sys_nerr;
676
677 char *ProgramName;
678
679 char *SysError ()
680 {
681+ extern char *sys_errlist[];
682 return ((errno >= 0 && errno < sys_nerr) ? sys_errlist[errno] : "?");
683 }
684
685***************
686*** 67,72 ****
687--- 67,73 ----
688 else
689 dbname = RGB_DB;
690
691+ #ifndef DBM_SUFFIX
692 strcpy (name, dbname);
693 strcat (name, ".dir");
694 fd = open (name, O_WRONLY|O_CREAT, 0666);
695***************
696*** 90,95 ****
697--- 91,100 ----
698 (void) close (fd);
699
700 rgb_dbm = dbm_open (dbname, O_RDWR, 0666);
701+ #else
702+ /* using Berkeley DB ndbm compatibility */
703+ rgb_dbm = dbm_open (dbname, O_RDWR | O_CREAT, 0666);
704+ #endif
705 if (!rgb_dbm) {
706 fprintf (stderr,
707 "%s: unable to open dbm database \"%s\" (error %d, %s)\n",
708diff -cr ../X11R5.pure/mit/server/Imakefile mit/server/Imakefile
709*** ../X11R5.pure/mit/server/Imakefile Fri May 28 18:10:33 1993
710--- mit/server/Imakefile Sun Jun 6 11:35:27 1993
711***************
712*** 46,53 ****
713--- 46,57 ----
714 #if SystemV4 && X386Server
715 SYSLIBS = -lm /usr/ucblib/libucb.a
716 #else
717+ #ifdef HasDB
718+ SYSLIBS = -lm
719+ #else
720 SYSLIBS = -lm -ldbm
721 #endif
722+ #endif
723 CBRT = ddx/mi/cbrt.o
724
725 XCOMM
726***************
727*** 113,118 ****
728--- 117,126 ----
729 ALL1 = XmacII
730 #endif
731
732+ #if XsolServer
733+ ALL1 = Xsol
734+ #endif
735+
736 #if XlunaServer
737 ALL1 = Xluna
738 #endif
739***************
740*** 125,130 ****
741--- 133,142 ----
742 ALL1 = X386
743 #endif
744
745+ #if XhpBSDServer
746+ ALL1 = XhpBSD
747+ #endif
748+
749 #if XnonServer
750 ALL2 = Xnon
751 #endif
752***************
753*** 297,302 ****
754--- 309,327 ----
755 #endif /* XmacIIServer */
756
757
758+ #if XsolServer
759+ XCOMM
760+ XCOMM OMRON Luna server for 4.4BSD
761+ XCOMM
762+ SUBDIRS0 = MFBSubdirs ddx/sol
763+ SOLDIRS = $(SUBDIRS0) $(DEPDIRS)
764+ SOLOBJS = ddx/sol/solInit.o
765+ SOLLIBS = MFBLibs ddx/sol/libsol.a $(MFB) $(MI)
766+
767+ ServerTarget(Xsol,$(SOLDIRS),$(SOLOBJS),$(SOLLIBS),$(SYSLIBS))
768+ #endif /* XlunaServer */
769+
770+
771 #if XlunaServer
772 XCOMM
773 XCOMM OMRON Luna server
774***************
775*** 343,348 ****
776--- 368,388 ----
777 INSTPGMFLAGS = $(INSTUIDFLAGS) /* server must be suid root */
778 ServerTarget(X386,$(X386DIRS),$(X386OBJS),$(X386LIBS),$(SYSLIBS))
779 #endif /* X386Server */
780+
781+
782+ #if XhpBSDServer
783+ XCOMM
784+ XCOMM XhpBSD server for BSD on HP Series 300/400/700 machines
785+ XCOMM
786+ SUBDIRS0 = StdSubdirs ddx/hpbsd
787+ HPBSDDIRS = $(SUBDIRS0) $(DEPDIRS)
788+ HPBSDOBJS = ddx/hpbsd/init.o
789+ HPBSDLIBS0 = ddx/hpbsd/topcat/libtopcat.a ddx/hpbsd/hyperion/libhyper.a
790+ HPBSDLIBS1 = ddx/hpbsd/libhpbsd.a ddx/hpbsd/input/libinput.a
791+ HPBSDLIBS2 = ddx/hpbsd/cfb/libcfb.a ddx/hpbsd/mfb/libmfb.a
792+ HPBSDLIBS = $(HPBSDLIBS0) $(HPBSDLIBS1) $(HPBSDLIBS2) StdLibs $(FONT)
793+ ServerTarget(XhpBSD,$(HPBSDDIRS),$(HPBSDOBJS),$(HPBSDLIBS),$(SYSLIBS))
794+ #endif /* XhpBSDServer */
795
796
797 #if XnonServer
798diff -cr ../X11R5.pure/mit/server/include/servermd.h mit/server/include/servermd.h
799*** ../X11R5.pure/mit/server/include/servermd.h Mon Jul 1 03:29:43 1991
800--- mit/server/include/servermd.h Sun Jun 6 11:10:27 1993
801***************
802*** 178,183 ****
803--- 178,192 ----
804
805 #endif /* hpux */
806
807+ #if defined(hp9000) /* BSD on hp's */
808+
809+ #define IMAGE_BYTE_ORDER MSBFirst
810+ #define BITMAP_BIT_ORDER MSBFirst
811+ #define GLYPHPADBYTES 2
812+ #define GETLEFTBITS_ALIGNMENT 4
813+
814+ #endif /* hp9000 */
815+
816 #if defined (M4310) || defined(M4315) || defined(M4317) || defined(M4319) || defined(M4330)
817
818 #define IMAGE_BYTE_ORDER MSBFirst /* Values for Pegasus only */
819diff -cr ../X11R5.pure/mit/util/makedepend/main.c mit/util/makedepend/main.c
820*** ../X11R5.pure/mit/util/makedepend/main.c Fri Jul 26 03:51:49 1991
821--- mit/util/makedepend/main.c Sun Jun 6 11:10:27 1993
822***************
823*** 13,18 ****
824--- 13,24 ----
825 #endif
826 #include <signal.h>
827
828+ #ifdef X_NOT_POSIX
829+ #include <sys/file.h>
830+ #else
831+ #include <unistd.h>
832+ #endif
833+
834 #ifdef DEBUG
835 int _debugmask;
836 #endif
837***************
838*** 267,278 ****
839--- 273,288 ----
840 sigemptyset(&sig_act.sa_mask);
841 sigaddset(&sig_act.sa_mask, SIGINT);
842 sigaddset(&sig_act.sa_mask, SIGQUIT);
843+ #ifdef SIGBUS
844 sigaddset(&sig_act.sa_mask, SIGBUS);
845+ #endif
846 sigaddset(&sig_act.sa_mask, SIGILL);
847 sigaddset(&sig_act.sa_mask, SIGSEGV);
848 sigaddset(&sig_act.sa_mask, SIGHUP);
849 sigaddset(&sig_act.sa_mask, SIGPIPE);
850+ #ifdef SIGSYS
851 sigaddset(&sig_act.sa_mask, SIGSYS);
852+ #endif
853 #else
854 sig_act.sa_mask = ((1<<(SIGINT -1))
855 |(1<<(SIGQUIT-1))
856***************
857*** 288,296 ****
858--- 298,310 ----
859 sigaction(SIGINT, &sig_act, (struct sigaction *)0);
860 sigaction(SIGQUIT, &sig_act, (struct sigaction *)0);
861 sigaction(SIGILL, &sig_act, (struct sigaction *)0);
862+ #ifdef SIGBUS
863 sigaction(SIGBUS, &sig_act, (struct sigaction *)0);
864+ #endif
865 sigaction(SIGSEGV, &sig_act, (struct sigaction *)0);
866+ #ifdef SIGSYS
867 sigaction(SIGSYS, &sig_act, (struct sigaction *)0);
868+ #endif
869 #endif /* USGISH
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.