jimke@uunet.uu.net (10/12/90)
Submitted-by: microsoft!jimke@uunet.uu.net Posting-number: Volume 9, Issue 93 Archive-name: sco.patches/part07 #! /bin/sh # This is a shell archive. Remove anything before this line, then unpack # it by saving it into a file and typing "sh file". To overwrite existing # files, type "sh file -c". You can also feed this as standard input via # unshar, or by typing "sh <file", e.g.. If this archive is complete, you # will see the following message at the end: # "End of archive 7 (of 12)." # Contents: fix-14.sco07 # Wrapped by jimke@kellman on Sat Oct 6 17:13:30 1990 PATH=/bin:/usr/bin:/usr/ucb ; export PATH if test -f 'fix-14.sco07' -a "${1}" != "-c" ; then echo shar: Will not clobber existing file \"'fix-14.sco07'\" else echo shar: Extracting \"'fix-14.sco07'\" \(47977 characters\) sed "s/^X//" >'fix-14.sco07' <<'END_OF_FILE' X*** ./mit-orig/lib/Xt/import.h Thu Oct 4 18:02:12 1990 X--- ./mit/lib/Xt/import.h Sun Sep 16 23:00:18 1990 X*************** X*** 0 **** X--- 1,392 ---- X+ /* X+ * Some hacks for shared libraries -- especially for 386/ix X+ * Thomas Roell, 16.4.90 X+ */ X+ #ifndef _Xt_import X+ #define _Xt_import X+ #ifdef ATTSHAREDLIB X+ #include <stdio.h> X+ #include <sys/types.h> X+ #include <time.h> X+ #include <pwd.h> X+ #include <X11/Xlib.h> X+ #include <X11/Xresource.h> X+ #include <X11/Xutil.h> X+ #include <X11/Intrinsic.h> X+ #include <X11/Shell.h> X+ X+ #define __fltused (* _libXt___fltused) X+ #define _ctype (* _libXt__ctype) X+ #define _filbuf (* _libXt__filbuf) X+ #define _flsbuf (* _libXt__flsbuf) X+ #define _fltused (* _libXt__fltused) X+ #define _iob (* _libXt__iob) X+ #define abs (* _libXt_abs) X+ #define access (* _libXt_access) X+ #define alarm (* _libXt_alarm) X+ #define asctime (* _libXt_asctime) X+ #define atof (* _libXt_atof) X+ #define atoi (* _libXt_atoi) X+ #define calloc (* _libXt_calloc) X+ #define chmod (* _libXt_chmod) X+ #define close (* _libXt_close) X+ #define creat (* _libXt_creat) X+ #define errno (* _libXt_errno) X+ #define exit (* _libXt_exit) X+ #define fclose (* _libXt_fclose) X+ #define fcntl (* _libXt_fcntl) X+ #define fgets (* _libXt_fgets) X+ #define fopen (* _libXt_fopen) X+ #define fprintf (* _libXt_fprintf) X+ #define fputs (* _libXt_fputs) X+ #define fread (* _libXt_fread) X+ #define free (* _libXt_free) X+ #define fseek (* _libXt_fseek) X+ #define ftell (* _libXt_ftell) X+ #define fwrite (* _libXt_fwrite) X+ #define getenv (* _libXt_getenv) X+ #define getlogin (* _libXt_getlogin) X+ #define getpwnam (* _libXt_getpwnam) X+ #define getpwuid (* _libXt_getpwuid) X+ #define getuid (* _libXt_getuid) X+ #define ioctl (* _libXt_ioctl) X+ #define link (* _libXt_link) X+ #define localtime (* _libXt_localtime) X+ #define malloc (* _libXt_malloc) X+ #define memcpy (* _libXt_memcpy) X+ #define memset (* _libXt_memset) X+ #define open (* _libXt_open) X+ #define perror (* _libXt_perror) X+ #define poll (* _libXt_poll) X+ #define printf (* _libXt_printf) X+ #define qsort (* _libXt_qsort) X+ #define rand (* _libXt_rand) X+ #define read (* _libXt_read) X+ #define realloc (* _libXt_realloc) X+ #define select (* _libXt_select) X+ #define signal (* _libXt_signal) X+ #define sleep (* _libXt_sleep) X+ #define sprintf (* _libXt_sprintf) X+ #define srand (* _libXt_srand) X+ #define sscanf (* _libXt_sscanf) X+ #define strcat (* _libXt_strcat) X+ #define strchr (* _libXt_strchr) X+ #define strcmp (* _libXt_strcmp) X+ #define strcpy (* _libXt_strcpy) X+ #define strlen (* _libXt_strlen) X+ #define strncmp (* _libXt_strncmp) X+ #define strncpy (* _libXt_strncpy) X+ #define strrchr (* _libXt_strrchr) X+ #define sys_errlist (* _libXt_sys_errlist) X+ #define sys_nerr (* _libXt_sys_nerr) X+ #define system (* _libXt_system) X+ #define times (* _libXt_times) X+ #define tmpnam (* _libXt_tmpnam) X+ #define toupper (* _libXt_toupper) X+ #define ulimit (* _libXt_ulimit) X+ #define uname (* _libXt_uname) X+ #define unlink (* _libXt_unlink) X+ #define write (* _libXt_write) X+ X+ #if defined(__STDC__) && !defined(NO_PROTOTYPE) X+ #else X+ X+ extern int __fltused; X+ extern unsigned char _ctype[]; X+ extern int _filbuf(); X+ extern int _flsbuf(); X+ extern int _fltused; X+ extern FILE *_iob; X+ extern int abs(); X+ extern int access(); X+ extern int alarm(); X+ extern int asctime(); X+ extern double atof(); X+ extern int atoi(); X+ extern char *calloc(); X+ extern int chmod(); X+ extern int close(); X+ extern int creat(); X+ extern int errno; X+ extern void exit(); X+ extern int fclose(); X+ extern int fcntl(); X+ extern char *fgets(); X+ extern FILE *fopen(); X+ extern int fprintf(); X+ extern int fputs(); X+ extern int fread(); X+ extern void free(); X+ extern int fseek(); X+ extern int ftell(); X+ extern int fwrite(); X+ extern char *getenv(); X+ extern int getlogin(); X+ extern struct passwd *getpwnam(); X+ extern struct passwd *getpwuid(); X+ extern int getuid(); X+ extern char *(* _libXt_index)(); X+ extern int ioctl(); X+ extern int link(); X+ extern struct tm *localtime(); X+ extern char *malloc(); X+ extern char *memcpy(); X+ extern char *memset(); X+ extern int open(); X+ extern void perror(); X+ extern int poll(); X+ extern int printf(); X+ extern int qsort(); X+ extern int rand(); X+ extern int read(); X+ extern char *realloc(); X+ extern int select(); X+ extern void (*signal())(); X+ extern int sleep(); X+ extern int sprintf(); X+ extern void srand(); X+ extern int sscanf(); X+ extern int (* _libXt_stat)(); X+ extern char *strcat(); X+ extern char *strchr(); X+ extern int strcmp(); X+ extern char *strcpy(); X+ extern size_t strlen(); X+ extern int strncmp(); X+ extern char *strncpy(); X+ extern char *strrchr(); X+ extern char *sys_errlist[]; X+ extern int sys_nerr; X+ extern int system(); X+ extern struct tm *(*_libXt_time)(); X+ extern int times(); X+ extern char *tmpnam(); X+ extern int toupper(); X+ extern int ulimit(); X+ extern int uname(); X+ extern int unlink(); X+ extern int write(); X+ X+ #endif X+ X+ #define XAllocColor (* _libXt_XAllocColor) X+ #define XAllocNamedColor (* _libXt_XAllocNamedColor) X+ #define XAllocSizeHints (* _libXt_XAllocSizeHints) X+ #define XChangeProperty (* _libXt_XChangeProperty) X+ #define XChangeWindowAttributes (* _libXt_XChangeWindowAttributes) X+ #define XCheckIfEvent (* _libXt_XCheckIfEvent) X+ #define XClearArea (* _libXt_XClearArea) X+ #define XClipBox (* _libXt_XClipBox) X+ #define XCloseDisplay (* _libXt_XCloseDisplay) X+ #define XConfigureWindow (* _libXt_XConfigureWindow) X+ #define XConvertSelection (* _libXt_XConvertSelection) X+ #define XCreateFontCursor (* _libXt_XCreateFontCursor) X+ #define XCreateGC (* _libXt_XCreateGC) X+ #define XCreatePixmap (* _libXt_XCreatePixmap) X+ #define XCreateRegion (* _libXt_XCreateRegion) X+ #define XCreateWindow (* _libXt_XCreateWindow) X+ #define XDeleteContext (* _libXt_XDeleteContext) X+ #define XDeleteProperty (* _libXt_XDeleteProperty) X+ #define XDestroyRegion (* _libXt_XDestroyRegion) X+ #define XDestroyWindow (* _libXt_XDestroyWindow) X+ #define XDisplayKeycodes (* _libXt_XDisplayKeycodes) X+ #define XEventsQueued (* _libXt_XEventsQueued) X+ #define XFindContext (* _libXt_XFindContext) X+ #define XFlush (* _libXt_XFlush) X+ #define XFree (* _libXt_XFree) X+ #define XFreeColors (* _libXt_XFreeColors) X+ #define XFreeCursor (* _libXt_XFreeCursor) X+ #define XFreeFont (* _libXt_XFreeFont) X+ #define XFreeGC (* _libXt_XFreeGC) X+ #define XGetAtomName (* _libXt_XGetAtomName) X+ #define XGetGeometry (* _libXt_XGetGeometry) X+ #define XGetKeyboardMapping (* _libXt_XGetKeyboardMapping) X+ #define XGetModifierMapping (* _libXt_XGetModifierMapping) X+ #define XGetSelectionOwner (* _libXt_XGetSelectionOwner) X+ #define XGetWindowProperty (* _libXt_XGetWindowProperty) X+ #define XGrabButton (* _libXt_XGrabButton) X+ #define XGrabKey (* _libXt_XGrabKey) X+ #define XGrabKeyboard (* _libXt_XGrabKeyboard) X+ #define XGrabPointer (* _libXt_XGrabPointer) X+ #define XIconifyWindow (* _libXt_XIconifyWindow) X+ #define XIfEvent (* _libXt_XIfEvent) X+ #define XInternAtom (* _libXt_XInternAtom) X+ #define XIntersectRegion (* _libXt_XIntersectRegion) X+ #define XKeysymToString (* _libXt_XKeysymToString) X+ #define XLoadFont (* _libXt_XLoadFont) X+ #define XLoadQueryFont (* _libXt_XLoadQueryFont) X+ #define XMapRaised (* _libXt_XMapRaised) X+ #define XMapSubwindows (* _libXt_XMapSubwindows) X+ #define XMapWindow (* _libXt_XMapWindow) X+ #define XMatchVisualInfo (* _libXt_XMatchVisualInfo) X+ #define XMaxRequestSize (* _libXt_XMaxRequestSize) X+ #define XMoveWindow (* _libXt_XMoveWindow) X+ #define XNextEvent (* _libXt_XNextEvent) X+ #define XOpenDisplay (* _libXt_XOpenDisplay) X+ #define XParseColor (* _libXt_XParseColor) X+ #define XPeekEvent (* _libXt_XPeekEvent) X+ #define XPending (* _libXt_XPending) X+ #define XPutBackEvent (* _libXt_XPutBackEvent) X+ #define XQueryColor (* _libXt_XQueryColor) X+ #define XQueryFont (* _libXt_XQueryFont) X+ #define XQueryPointer (* _libXt_XQueryPointer) X+ #define XRefreshKeyboardMapping (* _libXt_XRefreshKeyboardMapping) X+ #define XResourceManagerString (* _libXt_XResourceManagerString) X+ #define XSaveContext (* _libXt_XSaveContext) X+ #define XScreenNumberOfScreen (* _libXt_XScreenNumberOfScreen) X+ #define XSelectInput (* _libXt_XSelectInput) X+ #define XSendEvent (* _libXt_XSendEvent) X+ #define XSetClassHint (* _libXt_XSetClassHint) X+ #define XSetSelectionOwner (* _libXt_XSetSelectionOwner) X+ #define XSetTransientForHint (* _libXt_XSetTransientForHint) X+ #define XSetWMHints (* _libXt_XSetWMHints) X+ #define XSetWMIconName (* _libXt_XSetWMIconName) X+ #define XSetWMName (* _libXt_XSetWMName) X+ #define XSetWMNormalHints (* _libXt_XSetWMNormalHints) X+ #define XSetWMProperties (* _libXt_XSetWMProperties) X+ #define XStringToKeysym (* _libXt_XStringToKeysym) X+ #define XSynchronize (* _libXt_XSynchronize) X+ #define XTranslateCoordinates (* _libXt_XTranslateCoordinates) X+ #define XUngrabButton (* _libXt_XUngrabButton) X+ #define XUngrabKey (* _libXt_XUngrabKey) X+ #define XUngrabKeyboard (* _libXt_XUngrabKeyboard) X+ #define XUngrabPointer (* _libXt_XUngrabPointer) X+ #define XUnionRectWithRegion (* _libXt_XUnionRectWithRegion) X+ #define XUnloadFont (* _libXt_XUnloadFont) X+ #define XUnmapWindow (* _libXt_XUnmapWindow) X+ #define XWMGeometry (* _libXt_XWMGeometry) X+ #define XWithdrawWindow (* _libXt_XWithdrawWindow) X+ #define XrmDestroyDatabase (* _libXt_XrmDestroyDatabase) X+ #define XrmGetFileDatabase (* _libXt_XrmGetFileDatabase) X+ #define XrmGetResource (* _libXt_XrmGetResource) X+ #define XrmGetStringDatabase (* _libXt_XrmGetStringDatabase) X+ #define XrmInitialize (* _libXt_XrmInitialize) X+ #define XrmMergeDatabases (* _libXt_XrmMergeDatabases) X+ #define XrmParseCommand (* _libXt_XrmParseCommand) X+ #define XrmPutLineResource (* _libXt_XrmPutLineResource) X+ #define XrmQGetResource (* _libXt_XrmQGetResource) X+ #define XrmQGetSearchList (* _libXt_XrmQGetSearchList) X+ #define XrmQGetSearchResource (* _libXt_XrmQGetSearchResource) X+ #define XrmQuarkToString (* _libXt_XrmQuarkToString) X+ #define XrmStringToBindingQuarkList (* _libXt_XrmStringToBindingQuarkList) X+ #define XrmStringToQuark (* _libXt_XrmStringToQuark) X+ #define XrmUniqueQuark (* _libXt_XrmUniqueQuark) X+ #define bcmp (* _libXt_bcmp) X+ #define bcopy (* _libXt_bcopy) X+ #define bzero (* _libXt_bzero) X+ #define gettimeofday (* _libXt_gettimeofday) X+ X+ #if defined(__STDC__) && !defined(NO_PROTOTYPE) X+ #else X+ X+ extern int XAllocColor(); X+ extern int XAllocNamedColor(); X+ extern int XAllocSizeHints(); X+ extern int XChangeProperty(); X+ extern int XChangeWindowAttributes(); X+ extern int XCheckIfEvent(); X+ extern int XClearArea(); X+ extern int XClipBox(); X+ extern int XCloseDisplay(); X+ extern int XConfigureWindow(); X+ extern int XConvertSelection(); X+ extern int XCreateFontCursor(); X+ extern int XCreateGC(); X+ extern int XCreatePixmap(); X+ extern int XCreateRegion(); X+ extern int XCreateWindow(); X+ extern int XDeleteContext(); X+ extern int XDeleteProperty(); X+ extern int XDestroyRegion(); X+ extern int XDestroyWindow(); X+ extern int XDisplayKeycodes(); X+ extern int XEventsQueued(); X+ extern int XFindContext(); X+ extern int XFlush(); X+ extern int XFree(); X+ extern int XFreeColors(); X+ extern int XFreeCursor(); X+ extern int XFreeFont(); X+ extern int XFreeGC(); X+ extern int XGetAtomName(); X+ extern int XGetGeometry(); X+ extern int XGetKeyboardMapping(); X+ extern int XGetModifierMapping(); X+ extern int XGetSelectionOwner(); X+ extern int XGetWindowProperty(); X+ extern int XGrabButton(); X+ extern int XGrabKey(); X+ extern int XGrabKeyboard(); X+ extern int XGrabPointer(); X+ extern int XIconifyWindow(); X+ extern int XIfEvent(); X+ extern int XInternAtom(); X+ extern int XIntersectRegion(); X+ extern int XKeysymToString(); X+ extern int XLoadFont(); X+ extern int XLoadQueryFont(); X+ extern int XMapRaised(); X+ extern int XMapSubwindows(); X+ extern int XMapWindow(); X+ extern int XMatchVisualInfo(); X+ extern int XMaxRequestSize(); X+ extern int XMoveWindow(); X+ extern int XNextEvent(); X+ extern int XOpenDisplay(); X+ extern int XParseColor(); X+ extern int XPeekEvent(); X+ extern int XPending(); X+ extern int XPutBackEvent(); X+ extern int XQueryColor(); X+ extern int XQueryFont(); X+ extern int XQueryPointer(); X+ extern int XRefreshKeyboardMapping(); X+ extern int XResourceManagerString(); X+ extern int XSaveContext(); X+ extern int XScreenNumberOfScreen(); X+ extern int XSelectInput(); X+ extern int XSendEvent(); X+ extern int XSetClassHint(); X+ extern int XSetSelectionOwner(); X+ extern int XSetTransientForHint(); X+ extern int XSetWMHints(); X+ extern int XSetWMIconName(); X+ extern int XSetWMName(); X+ extern int XSetWMNormalHints(); X+ extern int XSetWMProperties(); X+ extern int XStringToKeysym(); X+ extern int XSynchronize(); X+ extern int XTranslateCoordinates(); X+ extern int XUngrabButton(); X+ extern int XUngrabKey(); X+ extern int XUngrabKeyboard(); X+ extern int XUngrabPointer(); X+ extern int XUnionRectWithRegion(); X+ extern int XUnloadFont(); X+ extern int XUnmapWindow(); X+ extern int XWMGeometry(); X+ extern int XWithdrawWindow(); X+ extern int XrmDestroyDatabase(); X+ extern int XrmGetFileDatabase(); X+ extern int XrmGetResource(); X+ extern int XrmGetStringDatabase(); X+ extern int XrmInitialize(); X+ extern int XrmMergeDatabases(); X+ extern int XrmParseCommand(); X+ extern int XrmPutLineResource(); X+ extern int XrmQGetResource(); X+ extern int XrmQGetSearchList(); X+ extern int XrmQGetSearchResource(); X+ extern int XrmQuarkToString(); X+ extern int XrmStringToBindingQuarkList(); X+ extern int XrmStringToQuark(); X+ extern int XrmUniqueQuark(); X+ extern int bcmp(); X+ extern void bcopy(); X+ extern void bzero(); X+ extern int gettimeofday(); X+ X+ #endif X+ X+ #endif X+ #endif X*** ./mit-orig/lib/Xt/sharedlib.c Thu Oct 4 16:44:22 1990 X--- ./mit/lib/Xt/sharedlib.c Sun Sep 16 22:48:27 1990 X*************** X*** 1,3 **** X--- 1,4 ---- X+ #include "import.h" X /* X * $XConsortium: sharedlib.c,v 1.8 90/03/05 17:34:01 kit Exp $ X * X*************** X*** 95,97 **** X--- 96,289 ---- X #else X static int dummy; /* avoid warning from ranlib */ X #endif /* SUNSHLIB */ X+ X+ #ifdef ATTSHAREDLIB X+ X+ #if defined(__STDC__) && !defined(NO_PROTOTYPE) X+ #else X+ X+ int __fltused = 0; X+ unsigned char _ctype[] = 0; X+ int _filbuf() = 0; X+ int _flsbuf() = 0; X+ int _fltused = 0; X+ FILE *_iob = 0; X+ int abs() = 0; X+ int access() = 0; X+ int alarm() = 0; X+ int asctime() = 0; X+ double atof() = 0; X+ int atoi() = 0; X+ char *calloc() = 0; X+ int chmod() = 0; X+ int close() = 0; X+ int creat() = 0; X+ int errno = 0; X+ void exit() = 0; X+ int fclose() = 0; X+ int fcntl() = 0; X+ char *fgets() = 0; X+ FILE *fopen() = 0; X+ int fprintf() = 0; X+ int fputs() = 0; X+ int fread() = 0; X+ void free() = 0; X+ int fseek() = 0; X+ int ftell() = 0; X+ int fwrite() = 0; X+ char *getenv() = 0; X+ int getlogin() = 0; X+ struct passwd *getpwnam() = 0; X+ struct passwd *getpwuid() = 0; X+ int getuid() = 0; X+ char *(* _libXt_index)() = 0; X+ int ioctl() = 0; X+ int link() = 0; X+ struct tm *localtime() = 0; X+ char *malloc() = 0; X+ char *memcpy() = 0; X+ char *memset() = 0; X+ int open() = 0; X+ void perror() = 0; X+ int poll() = 0; X+ int printf() = 0; X+ int qsort() = 0; X+ int rand() = 0; X+ int read() = 0; X+ char *realloc() = 0; X+ int select() = 0; X+ void (*signal())() = 0; X+ int sleep() = 0; X+ int sprintf() = 0; X+ void srand() = 0; X+ int sscanf() = 0; X+ int (* _libXt_stat)() = 0; X+ char *strcat() = 0; X+ char *strchr() = 0; X+ int strcmp() = 0; X+ char *strcpy() = 0; X+ size_t strlen() = 0; X+ int strncmp() = 0; X+ char *strncpy() = 0; X+ char *strrchr() = 0; X+ char *sys_errlist[] = 0; X+ int sys_nerr = 0; X+ int system() = 0; X+ struct tm *(*_libXt_time)() = 0; X+ int times() = 0; X+ char *tmpnam() = 0; X+ int toupper() = 0; X+ int ulimit() = 0; X+ int uname() = 0; X+ int unlink() = 0; X+ int write() = 0; X+ X+ int XAllocColor() = 0; X+ int XAllocNamedColor() = 0; X+ int XAllocSizeHints() = 0; X+ int XChangeProperty() = 0; X+ int XChangeWindowAttributes() = 0; X+ int XCheckIfEvent() = 0; X+ int XClearArea() = 0; X+ int XClipBox() = 0; X+ int XCloseDisplay() = 0; X+ int XConfigureWindow() = 0; X+ int XConvertSelection() = 0; X+ int XCreateFontCursor() = 0; X+ int XCreateGC() = 0; X+ int XCreatePixmap() = 0; X+ int XCreateRegion() = 0; X+ int XCreateWindow() = 0; X+ int XDeleteContext() = 0; X+ int XDeleteProperty() = 0; X+ int XDestroyRegion() = 0; X+ int XDestroyWindow() = 0; X+ int XDisplayKeycodes() = 0; X+ int XEventsQueued() = 0; X+ int XFindContext() = 0; X+ int XFlush() = 0; X+ int XFree() = 0; X+ int XFreeColors() = 0; X+ int XFreeCursor() = 0; X+ int XFreeFont() = 0; X+ int XFreeGC() = 0; X+ int XGetAtomName() = 0; X+ int XGetGeometry() = 0; X+ int XGetKeyboardMapping() = 0; X+ int XGetModifierMapping() = 0; X+ int XGetSelectionOwner() = 0; X+ int XGetWindowProperty() = 0; X+ int XGrabButton() = 0; X+ int XGrabKey() = 0; X+ int XGrabKeyboard() = 0; X+ int XGrabPointer() = 0; X+ int XIconifyWindow() = 0; X+ int XIfEvent() = 0; X+ int XInternAtom() = 0; X+ int XIntersectRegion() = 0; X+ int XKeysymToString() = 0; X+ int XLoadFont() = 0; X+ int XLoadQueryFont() = 0; X+ int XMapRaised() = 0; X+ int XMapSubwindows() = 0; X+ int XMapWindow() = 0; X+ int XMatchVisualInfo() = 0; X+ int XMaxRequestSize() = 0; X+ int XMoveWindow() = 0; X+ int XNextEvent() = 0; X+ int XOpenDisplay() = 0; X+ int XParseColor() = 0; X+ int XPeekEvent() = 0; X+ int XPending() = 0; X+ int XPutBackEvent() = 0; X+ int XQueryColor() = 0; X+ int XQueryFont() = 0; X+ int XQueryPointer() = 0; X+ int XRefreshKeyboardMapping() = 0; X+ int XResourceManagerString() = 0; X+ int XSaveContext() = 0; X+ int XScreenNumberOfScreen() = 0; X+ int XSelectInput() = 0; X+ int XSendEvent() = 0; X+ int XSetClassHint() = 0; X+ int XSetSelectionOwner() = 0; X+ int XSetTransientForHint() = 0; X+ int XSetWMHints() = 0; X+ int XSetWMIconName() = 0; X+ int XSetWMName() = 0; X+ int XSetWMNormalHints() = 0; X+ int XSetWMProperties() = 0; X+ int XStringToKeysym() = 0; X+ int XSynchronize() = 0; X+ int XTranslateCoordinates() = 0; X+ int XUngrabButton() = 0; X+ int XUngrabKey() = 0; X+ int XUngrabKeyboard() = 0; X+ int XUngrabPointer() = 0; X+ int XUnionRectWithRegion() = 0; X+ int XUnloadFont() = 0; X+ int XUnmapWindow() = 0; X+ int XWMGeometry() = 0; X+ int XWithdrawWindow() = 0; X+ int XrmDestroyDatabase() = 0; X+ int XrmGetFileDatabase() = 0; X+ int XrmGetResource() = 0; X+ int XrmGetStringDatabase() = 0; X+ int XrmInitialize() = 0; X+ int XrmMergeDatabases() = 0; X+ int XrmParseCommand() = 0; X+ int XrmPutLineResource() = 0; X+ int XrmQGetResource() = 0; X+ int XrmQGetSearchList() = 0; X+ int XrmQGetSearchResource() = 0; X+ int XrmQuarkToString() = 0; X+ int XrmStringToBindingQuarkList() = 0; X+ int XrmStringToQuark() = 0; X+ int XrmUniqueQuark() = 0; X+ int bcmp() = 0; X+ void bcopy() = 0; X+ void bzero() = 0; X+ int gettimeofday() = 0; X+ X+ #endif X+ #endif X*** ./mit-orig/rgb/Imakefile Thu Oct 4 17:08:36 1990 X--- ./mit/rgb/Imakefile Mon Sep 17 10:41:11 1990 X*************** X*** 27,29 **** X--- 27,42 ---- X $(RM) $(DATAFILES) X X DependTarget() X+ X+ #ifdef i386Architecture X+ #if HasGcc X+ /* X+ * gcc is not handling full structure returns in the same mannar as X+ * cc or rcc. X+ */ X+ rgb.o: rgb.c X+ rcc $(CFLAGS) -c rgb.c X+ showrgb.o: showrgb.c X+ rcc $(CFLAGS) -c showrgb.c X+ #endif X+ #endif X*** ./mit-orig/rgb/rgb.c Thu Oct 4 17:08:36 1990 X--- ./mit/rgb/rgb.c Sun Sep 16 21:40:10 1990 X*************** X*** 14,20 **** X--- 14,24 ---- X #include <dbm.h> X #define dbm_open(name,flags,mode) (!dbminit(name)) X #define dbm_store(db,key,content,flags) (store(key,content)) X+ #if sco X+ #define dbm_close(x) X+ #else X #define dbm_close(db) dbmclose() X+ #endif X #endif X X #undef NULL X*** ./mit-orig/rgb/showrgb.c Thu Oct 4 17:08:35 1990 X--- ./mit/rgb/showrgb.c Sun Sep 16 21:41:54 1990 X*************** X*** 30,37 **** X--- 30,41 ---- X #define dbm_open(name,flags,mode) (!dbminit(name)) X #define dbm_firstkey(db) (firstkey()) X #define dbm_fetch(db,key) (fetch(key)) X+ #if sco X+ #define dbm_close(x) X+ #else X #define dbm_close(db) dbmclose() X #endif X+ #endif X X #undef NULL X #include <stdio.h> X*************** X*** 38,43 **** X--- 42,51 ---- X #include <X11/Xos.h> X #include "rgb.h" /* off in server/include/ */ X #include "site.h" X+ X+ #if sco X+ #define bcopy(x, y, z) memcpy(y, x, z) X+ #endif X X char *ProgramName; X X*** ./mit-orig/server/Imakefile Thu Oct 4 16:53:14 1990 X--- ./mit/server/Imakefile Mon Sep 17 18:25:05 1990 X*************** X*** 28,34 **** X TEK = ddx/tek/libtek.a X XAULIB = $(TOP)/lib/Xau/libXau.a X XDMCPLIB = $(TOP)/lib/Xdmcp/libXdmcp.a X! SYSLIBS = -lm -ldbm X X /**/# X /**/# This turns off the default rule for compiling .c files because X--- 28,34 ---- X TEK = ddx/tek/libtek.a X XAULIB = $(TOP)/lib/Xau/libXau.a X XDMCPLIB = $(TOP)/lib/Xdmcp/libXdmcp.a X! SYSLIBS = -lm -lx X X /**/# X /**/# This turns off the default rule for compiling .c files because X*************** X*** 319,329 **** X--- 319,338 ---- X #define need_ddx_mfb X #define need_ddx_ibm X #define need_os_42bsd X+ #ifdef i386Architecture X+ #define need_os_bsdemul X+ IBMDIRS = dix ddx/snf ddx/mi ddx/mfb ddx/ibm os/4.2bsd os/bsdemul X+ IBMOBJS = ddx/ibm/common/ibmcomm.o ddx/ibm/common/ibmDate.o $(FONTUTIL) X+ IBMLIBS = ddx/ibm/libibm.a $(IBMALLOCLIB) \ X+ $(DIX) $(BSD) $(BSDEMUL) $(SNF) $(MFB) $(MI) $(EXTENSIONS) X+ IBMSYSLIBS = $(SYSLIBS) -ldbm X+ #else X IBMDIRS = dix ddx/snf ddx/mi ddx/mfb ddx/ibm os/4.2bsd X IBMOBJS = ddx/ibm/common/ibmcomm.o ddx/ibm/common/ibmDate.o $(FONTUTIL) X IBMLIBS = ddx/ibm/libibm.a $(IBMALLOCLIB) \ X $(DIX) $(BSD) $(SNF) $(MFB) $(MI) $(EXTENSIONS) X IBMSYSLIBS = $(SYSLIBS) X+ #endif X XibmDIRS = $(IBMDIRS) X X ServerTarget(Xibm,$(EXTDIR) $(FONTUTILDIR) $(IBMDIRS),$(IBMOBJS),$(IBMLIBS),$(IBMSYSLIBS)) X*** ./mit-orig/server/ddx/ibm/common/Imakefile Thu Oct 4 16:50:01 1990 X--- ./mit/server/ddx/ibm/common/Imakefile Sun Sep 16 22:07:40 1990 X*************** X*** 152,163 **** X--- 152,172 ---- X -DDEVELOPER="\"`who -A`\"" \ X -c ibmDate.c X #else X+ #ifndef AIX386 X ibmDate.o: FRC X $(CC) $(CFLAGS) \ X -DDATE="\"`date`\"" \ X+ -DHOST="\"`uname`\"" \ X+ -DDEVELOPER="\"`who am i|sed 1q|sed -e 's/.*\!//'|sed -e 's/[ ].*$$//'`\"" \ X+ -c ibmDate.c X+ #else X+ ibmDate.o: FRC X+ $(CC) $(CFLAGS) \ X+ -DDATE="\"`date`\"" \ X -DHOST="\"`hostname`\"" \ X -DDEVELOPER="\"`who am i|sed 1q|sed -e 's/.*\!//'|sed -e 's/[ ].*$$//'`\"" \ X -c ibmDate.c X+ #endif X #endif X X FRC: X*** ./mit-orig/server/ddx/ibm/common/ibmCmdArgs.c Thu Oct 4 16:50:02 1990 X--- ./mit/server/ddx/ibm/common/ibmCmdArgs.c Sun Sep 16 22:07:41 1990 X*************** X*** 133,139 **** X } X #endif /* IBM_BS_FLAGS */ X X! #if defined(AIXrt) || defined(AIX386) X X static int X dontZap( myArg ) X--- 133,139 ---- X } X #endif /* IBM_BS_FLAGS */ X X! #if defined(AIXrt) || defined(AIX386) || defined(SYSV) X X static int X dontZap( myArg ) X*************** X*** 153,159 **** X } X #endif X X! #if defined(AIXrt) || defined(AIX386) X static int X processRGBpath( myArg ) X char **myArg ; X--- 153,159 ---- X } X #endif X X! #if defined(AIXrt) || defined(AIX386) || defined(SYSV) X static int X processRGBpath( myArg ) X char **myArg ; X*************** X*** 325,332 **** X { X return ( ibmBlackPixelText = myArg[1] ) ? 2 : 0 ; X } X X! #if defined(AIXrt) || defined(AIX386) X #define REALLY_DIX_ARG( string ) string X #else /* BSD */ X #define REALLY_DIX_ARG( string ) ( (char *) 0 ) X--- 325,360 ---- X { X return ( ibmBlackPixelText = myArg[1] ) ? 2 : 0 ; X } X+ #if defined(ix386) || defined(sco) X+ static int X+ selectMS ( myArg ) X+ char **myArg ; X+ { X+ SYSVMouseType = MicroSoft; X+ return 1; X+ } X X! static int X! selectMSM ( myArg ) X! char **myArg ; X! { X! SYSVMouseType = MouseSystems; X! return 1; X! } X! static int X! mousedev( myArg ) X! char **myArg ; X! { X! return ( SYSVPtrDev = myArg[1] ) ? 2 : 0 ; X! } X! static int X! resolution( myArg ) X! char **myArg ; X! { X! return ( SYSVresolution = myArg[1] ) ? 2 : 0 ; X! } X! #endif X! #if defined(AIXrt) || defined(AIX386) || defined(SYSV) X #define REALLY_DIX_ARG( string ) string X #else /* BSD */ X #define REALLY_DIX_ARG( string ) ( (char *) 0 ) X*************** X*** 344,350 **** X { "-wp", X " -wp <color> specify a WhitePixel color\n", X getWhitePixelText }, X! #if defined(AIXrt) || defined(AIX386) X { "-a", X " -a <accel> specify the mouse acceleration\n", X (int (*)()) 0 }, /* DIX Argument */ X--- 372,378 ---- X { "-wp", X " -wp <color> specify a WhitePixel color\n", X getWhitePixelText }, X! #if defined(AIXrt) || defined(AIX386) || defined(SYSV) X { "-a", X " -a <accel> specify the mouse acceleration\n", X (int (*)()) 0 }, /* DIX Argument */ X*************** X*** 366,374 **** X--- 394,404 ---- X { "-fp", X " -fp <path> specify the search path for fonts\n", X (int (*)()) 0 }, /* DIX Argument */ X+ #if defined(AIXrt) || defined(AIX386) X { "-n", X " -n :<num> specify the connection number\n", X processAIXdisplaySpec }, X+ #endif X { "-p", X " -p <interval> specify the screen saver interval\n", X (int (*)()) 0 }, /* DIX Argument */ X*************** X*** 390,395 **** X--- 420,439 ---- X { "-v", X " -v activate screen saver with background color\n", X (int (*)()) 0 }, /* DIX Argument */ X+ #if defined(ix386) || defined(sco) X+ { "-2", X+ " -2 select MicroSoft serial mouse (default)\n", X+ selectMS }, X+ { "-3", X+ " -3 select MouseSystems Mouse\n", X+ selectMSM }, X+ { "-dev", X+ " -dev <path> specify the mouse-device (default: /dev/tty1a)\n", X+ mousedev }, X+ { "-mode", X+ " -mode <mode> select mode for display (default: 640x480)\n", X+ resolution }, X+ #endif X #endif X { "-lock", X " -lock enable caps lock key (default)\n", X*************** X*** 481,487 **** X register ArgumentStr *argDescPtr ; X register int i = osCmdArgTableSize ; X X! #if defined(AIXrt) || defined(AIX386) X ErrorF( "The \"X\" command accepts the following flags:\n" ) ; X #endif X X--- 525,531 ---- X register ArgumentStr *argDescPtr ; X register int i = osCmdArgTableSize ; X X! #if defined(AIXrt) || defined(AIX386) || defined(SYSV) X ErrorF( "The \"X\" command accepts the following flags:\n" ) ; X #endif X X*** ./mit-orig/server/ddx/ibm/common/ibmIO.c Thu Oct 4 16:50:04 1990 X--- ./mit/server/ddx/ibm/common/ibmIO.c Sun Sep 16 22:07:41 1990 X*************** X*** 73,79 **** X--- 73,81 ---- X #endif X X #include <sys/types.h> X+ #if !defined(ix386) && !defined(sco) X #include <sys/time.h> X+ #endif X X #define NEED_EVENTS X X*** ./mit-orig/server/ddx/ibm/common/ibmIOArch.h Thu Oct 4 16:50:04 1990 X--- ./mit/server/ddx/ibm/common/ibmIOArch.h Sun Sep 16 22:07:41 1990 X*************** X*** 63,73 **** X */ X X #if defined(lint) || defined(PCIO) || defined(i386) || defined(iAPX286) X! X extern unsigned char inb( ) ; X extern unsigned char outb( ) ; X extern unsigned short int inw( ) ; X extern unsigned short outw( ) ; X extern void INTS_ON() ; X extern void INTS_OFF() ; X X--- 63,74 ---- X */ X X #if defined(lint) || defined(PCIO) || defined(i386) || defined(iAPX286) X! #ifndef __GNUC__ X extern unsigned char inb( ) ; X extern unsigned char outb( ) ; X extern unsigned short int inw( ) ; X extern unsigned short outw( ) ; X+ #endif X extern void INTS_ON() ; X extern void INTS_OFF() ; X X*** ./mit-orig/server/ddx/ibm/common/ibmMalloc.c Thu Oct 4 16:50:06 1990 X--- ./mit/server/ddx/ibm/common/ibmMalloc.c Tue Sep 18 21:44:07 1990 X*************** X*** 111,117 **** X--- 111,123 ---- X X #include <stdio.h> X #include "ibmMalloc.h" X+ #include "Xos.h" X X+ #if defined(sco) && !defined(__GNUC__) X+ #undef NULL X+ #define NULL 0 X+ #endif X+ X #ifdef notdef X static char msgbuf[200]; X #define ferr4(fmt, a, b, c, d) {sprintf(msgbuf, fmt, a, b, c, d); \ X*************** X*** 961,970 **** X--- 967,978 ---- X X X #include <sys/types.h> X+ #if !defined(ix386) && !defined(sco) X #include <sys/time.h> X #if !defined(AIXrt) X #include <sys/resource.h> X #endif X+ #endif X extern etext; X X AbortFullMessage (nbytes) X*************** X*** 972,978 **** X { X register siz, segbytes; X char buf[200]; X! #if defined(AIXrt) X char *maxBrk = (char *) ulimit( 3, 0 ) ; X char *oldBrk ; X #else X--- 980,986 ---- X { X register siz, segbytes; X char buf[200]; X! #if defined(AIXrt) || defined(ix386) || defined(sco) X char *maxBrk = (char *) ulimit( 3, 0 ) ; X char *oldBrk ; X #else X*************** X*** 984,990 **** X segbytes = ((siz+2*EPSILON+(SEGGRAIN-1)) X / SEGGRAIN) * SEGGRAIN; X X! #if !defined(AIXrt) X getrlimit (RLIMIT_DATA, &rlp); X if ((int)sbrk(0)+segbytes > etext+rlp.rlim_max) X sprintf(buf, "Malloc abort. Attempt to allocate %d bytes caused data segment to exceed its maximum of %d bytes.\n", X--- 992,998 ---- X segbytes = ((siz+2*EPSILON+(SEGGRAIN-1)) X / SEGGRAIN) * SEGGRAIN; X X! #if !defined(AIXrt) && ! defined(ix386) && ! defined(sco) X getrlimit (RLIMIT_DATA, &rlp); X if ((int)sbrk(0)+segbytes > etext+rlp.rlim_max) X sprintf(buf, "Malloc abort. Attempt to allocate %d bytes caused data segment to exceed its maximum of %d bytes.\n", X*** ./mit-orig/server/ddx/ibm/sysV/Imakefile Thu Oct 4 18:02:18 1990 X--- ./mit/server/ddx/ibm/sysV/Imakefile Mon Sep 17 10:47:56 1990 X*************** X*** 0 **** X--- 1,52 ---- X+ #include <Server.tmpl> X+ OSDEP_SRC = sysV386.s X+ OSDEP_OBJ = sysV386.o X+ SRCS = sysVCursor.c \ X+ sysVEvents.c \ X+ sysVInit.c \ X+ sysVKeybd.c \ X+ sysVMouse.c \ X+ $(OSDEP_SRC) X+ LIBOBJS = sysVCursor.o \ X+ sysVEvents.o \ X+ sysVInit.o \ X+ sysVKeybd.o \ X+ sysVMouse.o \ X+ $(OSDEP_OBJ) X+ OBJS = $(OTHROBJS) $(LIBOBJS) X+ #if ibmSpecialMalloc X+ DEFINES = -DIBM_SPECIAL_MALLOC X+ #else X+ DEFINES = X+ #endif X+ INCLUDES = -I. -I../../../include -I$(INCLUDESRC) -I../common -I../../../../extensions/include -I../../../os/4.2bsd X+ #if DebugServer && ProfileServer X+ DebuggedAndProfiledLibraryObjectRule() X+ #else X+ # if DebugServer X+ DebuggedLibraryObjectRule() X+ # else X+ # if ProfileServer X+ ProfiledLibraryObjectRule() X+ # else X+ NormalLibraryObjectRule() X+ # endif X+ # endif X+ #endif X+ all:: $(OTHROBJS) X+ NormalRelocatableTarget(OPERATING_SYSTEM,$(LIBOBJS)) X+ #ifdef LCGBUILD X+ COMPILE_LIST = $(OBJS) X+ BUILD_LIST = sysV.o X+ #endif X+ #if ProfileServer X+ ProfiledRelocatableTarget(OPERATING_SYSTEM,$(LIBOBJS)) X+ #endif X+ #if DebugServer X+ DebuggedRelocatableTarget(OPERATING_SYSTEM,$(LIBOBJS)) X+ #endif X+ DependTarget() X+ #ifndef LCGBUILD X+ LintLibraryTarget(OPERATING_SYSTEM,$(SRCS)) X+ NormalLintTarget($(SRCS)) X+ #endif X*** ./mit-orig/server/ddx/ibm/sysV/Makefile Thu Oct 4 18:02:18 1990 X--- ./mit/server/ddx/ibm/sysV/Makefile Tue Sep 25 18:59:19 1990 X*************** X*** 0 **** X--- 1,390 ---- X+ # Makefile generated by imake - do not edit! X+ # $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $ X+ # X+ # The cpp used on this machine replaces all newlines and multiple tabs and X+ # spaces in a macro expansion with a single space. Imake tries to compensate X+ # for this, but is not always successful. X+ # X+ X+ ########################################################################### X+ # Makefile generated from "Imake.tmpl" and <Imakefile> X+ # $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $ X+ # X+ # Platform-specific parameters may be set in the appropriate .cf X+ # configuration files. Site-wide parameters may be set in the file X+ # site.def. Full rebuilds are recommended if any parameters are changed. X+ # X+ # If your C preprocessor doesn't define any unique symbols, you'll need X+ # to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing X+ # "make Makefile", "make Makefiles", or "make World"). X+ # X+ # If you absolutely can't get imake to work, you'll need to set the X+ # variables at the top of each Makefile as well as the dependencies at the X+ # bottom (makedepend will do this automatically). X+ # X+ X+ ########################################################################### X+ # platform-specific configuration parameters - edit sco.cf to change X+ X+ # platform: $XConsortium: sco.cf,v 1.0 90/03/10 15:39:46 jim Exp $ X+ # operating system: SCO Unix System V Release 3.2 X+ X+ ########################################################################### X+ # site-specific configuration parameters - edit site.def to change X+ X+ # site: $XConsortium: site.def,v 1.21 89/12/06 11:46:50 jim Exp $ X+ X+ SHELL = /bin/sh X+ X+ TOP = ../../../../. X+ CURRENT_DIR = ./server/ddx/ibm/sysV X+ X+ AR = ar cq X+ BOOTSTRAPCFLAGS = -Dsco -DSYSV X+ CC = gcc X+ X+ COMPRESS = compress X+ CPP = /lib/cpp $(STD_CPP_DEFINES) X+ PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES) X+ INSTALL = $(SCRIPTSRC)/install.sh X+ LD = ld X+ LINT = lint X+ LINTLIBFLAG = -o X+ LINTOPTS = -ax X+ LN = ln X+ MAKE = make X+ MV = mv X+ CP = cp X+ RANLIB = $(SCRIPTSRC)/makeshlib X+ RANLIBINSTFLAGS = X+ RM = rm -f X+ STD_INCLUDES = X+ STD_CPP_DEFINES = -Datt -Dsco -DSYSV -DUSG -DUSE_ASM X+ STD_DEFINES = -Datt -Dsco -DSYSV -DUSG -DUSE_ASM X+ EXTRA_LOAD_FLAGS = -lpt -lnsl_s -lc_s X+ EXTRA_LIBRARIES = X+ TAGS = ctags X+ X+ MFLAGS = -$(MAKEFLAGS) X+ X+ PROTO_DEFINES = X+ X+ INSTPGMFLAGS = -s X+ X+ INSTBINFLAGS = -m 0755 X+ INSTUIDFLAGS = -m 4755 X+ INSTLIBFLAGS = -m 0664 X+ INSTINCFLAGS = -m 0444 X+ INSTMANFLAGS = -m 0444 X+ INSTDATFLAGS = -m 0444 X+ INSTKMEMFLAGS = -m 4755 X+ X+ DESTDIR = X+ X+ TOP_INCLUDES = -I$(TOP) X+ X+ CDEBUGFLAGS = -O X+ CCOPTIONS = X+ COMPATFLAGS = X+ X+ ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) X+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS) X+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) X+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) X+ LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) X+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) X+ LDCOMBINEFLAGS = -r X+ X+ MACROFILE = sco.cf X+ RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut X+ X+ IMAKE_DEFINES = X+ X+ IRULESRC = $(CONFIGSRC) X+ IMAKE_CMD = $(NEWTOP)$(IMAKE) -I$(NEWTOP)$(IRULESRC) $(IMAKE_DEFINES) X+ X+ ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \ X+ $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \ X+ $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES) X+ X+ ########################################################################### X+ # X Window System Build Parameters X+ # $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ X+ X+ ########################################################################### X+ # X Window System make variables; this need to be coordinated with rules X+ # $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ X+ X+ PATHSEP = / X+ USRLIBDIR = $(DESTDIR)/usr/lib X+ BINDIR = $(DESTDIR)/usr/bin/X11 X+ INCROOT = $(DESTDIR)/usr/include X+ BUILDINCROOT = $(TOP) X+ BUILDINCDIR = $(BUILDINCROOT)/X11 X+ BUILDINCTOP = .. X+ INCDIR = $(INCROOT)/X11 X+ ADMDIR = $(DESTDIR)/usr/adm X+ LIBDIR = $(USRLIBDIR)/X11 X+ CONFIGDIR = $(LIBDIR)/config X+ LINTLIBDIR = $(USRLIBDIR)/lint X+ X+ FONTDIR = $(LIBDIR)/fonts X+ XINITDIR = $(LIBDIR)/xinit X+ XDMDIR = $(LIBDIR)/xdm X+ AWMDIR = $(LIBDIR)/awm X+ TWMDIR = $(LIBDIR)/twm X+ GWMDIR = $(LIBDIR)/gwm X+ MANPATH = $(DESTDIR)/usr/man X+ MANSOURCEPATH = $(MANPATH)/man X+ MANDIR = /usr/man/cat.X X+ LIBMANDIR = $(MANSOURCEPATH)3 X+ XAPPLOADDIR = $(LIBDIR)/app-defaults X+ X+ FONTCFLAGS = -t X+ X+ INSTAPPFLAGS = $(INSTDATFLAGS) X+ X+ IMAKE = $(IMAKESRC)/imake X+ DEPEND = $(DEPENDSRC)/makedepend X+ RGB = $(RGBSRC)/rgb X+ FONTC = $(BDFTOSNFSRC)/bdftosnf X+ MKFONTDIR = $(MKFONTDIRSRC)/mkfontdir X+ MKDIRHIER = /bin/sh $(SCRIPTSRC)/mkdirhier.sh X+ X+ CONFIGSRC = $(TOP)/config X+ CLIENTSRC = $(TOP)/clients X+ DEMOSRC = $(TOP)/demos X+ LIBSRC = $(TOP)/lib X+ FONTSRC = $(TOP)/fonts X+ INCLUDESRC = $(TOP)/X11 X+ SERVERSRC = $(TOP)/server X+ UTILSRC = $(TOP)/util X+ SCRIPTSRC = $(UTILSRC)/scripts X+ EXAMPLESRC = $(TOP)/examples X+ CONTRIBSRC = $(TOP)/../contrib X+ DOCSRC = $(TOP)/doc X+ RGBSRC = $(TOP)/rgb X+ DEPENDSRC = $(UTILSRC)/makedepend X+ IMAKESRC = $(CONFIGSRC) X+ XAUTHSRC = $(LIBSRC)/Xau X+ XLIBSRC = $(LIBSRC)/X X+ XMUSRC = $(LIBSRC)/Xmu X+ TOOLKITSRC = $(LIBSRC)/Xt X+ AWIDGETSRC = $(LIBSRC)/Xaw X+ OLDXLIBSRC = $(LIBSRC)/oldX X+ XDMCPLIBSRC = $(LIBSRC)/Xdmcp X+ BDFTOSNFSRC = $(FONTSRC)/bdftosnf X+ MKFONTDIRSRC = $(FONTSRC)/mkfontdir X+ EXTENSIONSRC = $(TOP)/extensions X+ X+ DEPEXTENSIONLIB = $(EXTENSIONSRC)/lib/libXext.a X+ EXTENSIONLIB = $(DEPEXTENSIONLIB) X+ X+ DEPXLIB = $(DEPEXTENSIONLIB) $(XLIBSRC)/libX11.a X+ XLIB = $(EXTENSIONLIB) $(XLIBSRC)/libX11.a X+ X+ DEPXAUTHLIB = $(XAUTHSRC)/libXau.a X+ XAUTHLIB = $(DEPXAUTHLIB) X+ X+ DEPXMULIB = $(XMUSRC)/libXmu.a X+ XMULIB = $(DEPXMULIB) X+ X+ DEPOLDXLIB = $(OLDXLIBSRC)/liboldX.a X+ OLDXLIB = $(DEPOLDXLIB) X+ X+ DEPXTOOLLIB = $(TOOLKITSRC)/libXt.a X+ XTOOLLIB = $(DEPXTOOLLIB) X+ X+ DEPXAWLIB = $(AWIDGETSRC)/libXaw.a X+ XAWLIB = $(DEPXAWLIB) X+ X+ LINTEXTENSIONLIB = $(EXTENSIONSRC)/lib/llib-lXext.ln X+ LINTXLIB = $(XLIBSRC)/llib-lX11.ln X+ LINTXMU = $(XMUSRC)/llib-lXmu.ln X+ LINTXTOOL = $(TOOLKITSRC)/llib-lXt.ln X+ LINTXAW = $(AWIDGETSRC)/llib-lXaw.ln X+ X+ DEPLIBS = $(LOCAL_LIBRARIES) X+ X+ DEPLIBS1 = $(DEPLIBS) X+ DEPLIBS2 = $(DEPLIBS) X+ DEPLIBS3 = $(DEPLIBS) X+ X+ ########################################################################### X+ # Imake rules for building libraries, programs, scripts, and data files X+ # rules: $XConsortium: Imake.rules,v 1.67 89/12/18 17:14:15 jim Exp $ X+ X+ ########################################################################### X+ # start of Imakefile X+ X+ # $XConsortium: Server.tmpl,v 1.3 89/10/20 11:14:52 jim Exp $ X+ X+ CC = gcc X+ CCOPTIONS = X+ STD_DEFINES = -Datt -Dsco -DSYSV -DUSG -DUSE_ASM -DSHAPE -DMULTIBUFFER -DMITSHM -DMITMISC -DNO_FUNCTION_PROTOTYPES X+ CDEBUGFLAGS = X+ EXT_DEFINES = -DSHAPE -DMULTIBUFFER -DMITSHM -DMITMISC X+ X+ OSDEP_SRC = sysV386.s X+ OSDEP_OBJ = sysV386.o X+ SRCS = sysVCursor.c \ X+ sysVEvents.c \ X+ sysVInit.c \ X+ sysVKeybd.c \ X+ sysVMouse.c \ X+ $(OSDEP_SRC) X+ LIBOBJS = sysVCursor.o \ X+ sysVEvents.o \ X+ sysVInit.o \ X+ sysVKeybd.o \ X+ sysVMouse.o \ X+ $(OSDEP_OBJ) X+ OBJS = $(OTHROBJS) $(LIBOBJS) X+ X+ DEFINES = X+ X+ INCLUDES = -I. -I../../../include -I$(INCLUDESRC) -I../common -I../../../../extensions/include -I../../../os/4.2bsd X+ X+ .c.o: X+ $(RM) $@ X+ $(CC) -c $(CFLAGS) $*.c X+ X+ all:: $(OTHROBJS) X+ X+ all:: sysV.o X+ X+ sysV.o: $(LIBOBJS) X+ $(RM) $@ X+ $(LD) $(LDCOMBINEFLAGS) $(LIBOBJS) -o $@ X+ X+ depend:: $(DEPEND) X+ X+ $(DEPEND): X+ @echo "checking $@ over in $(DEPENDSRC) first..."; \ X+ cd $(DEPENDSRC); $(MAKE); \ X+ echo "okay, continuing in $(CURRENT_DIR)" X+ X+ depend:: X+ $(DEPEND) -s "# DO NOT DELETE" -- $(ALLDEFINES) -- $(SRCS) X+ X+ lintlib:: llib-lOPERATING_SYSTEM.ln X+ X+ llib-lOPERATING_SYSTEM.ln: $(SRCS) X+ $(RM) $@ X+ $(LINT) $(LINTLIBFLAG)sysV $(LINTFLAGS) $(SRCS) X+ X+ lint: X+ $(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS) X+ lint1: X+ $(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS) X+ X+ ########################################################################### X+ # common rules for all Makefiles - do not edit X+ X+ emptyrule:: X+ X+ clean:: X+ $(RM_CMD) \#* X+ X+ Makefile:: $(IMAKE) X+ X+ $(IMAKE): X+ @(cd $(IMAKESRC); if [ -f Makefile ]; then \ X+ echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) all; else \ X+ echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \ X+ $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS); fi; \ X+ echo "okay, continuing in $(CURRENT_DIR)") X+ X+ Makefile:: X+ -@if [ -f Makefile ]; then \ X+ echo " $(RM) Makefile.bak; $(MV) Makefile Makefile.bak"; \ X+ $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \ X+ else exit 0; fi X+ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) X+ X+ tags:: X+ $(TAGS) -w *.[ch] X+ $(TAGS) -xw *.[ch] > TAGS X+ X+ ########################################################################### X+ # empty rules for directories that do not have SUBDIRS - do not edit X+ X+ install:: X+ @echo "install in $(CURRENT_DIR) done" X+ X+ install.man:: X+ @echo "install.man in $(CURRENT_DIR) done" X+ X+ Makefiles:: X+ X+ includes:: X+ X+ ########################################################################### X+ # dependencies generated by makedepend X+ X+ # DO NOT DELETE X+ X+ sysVCursor.o: /usr/include/stdio.h /usr/include/limits.h X+ sysVCursor.o: /usr/include/sys/types.h /usr/include/sys/file.h X+ sysVCursor.o: ../../../.././X11/X.h ../../../.././X11/Xproto.h X+ sysVCursor.o: ../../../.././X11/Xmd.h ../../../.././X11/Xprotostr.h X+ sysVCursor.o: ../../../include/input.h ../../../include/misc.h X+ sysVCursor.o: ../../../include/os.h ../../../include/scrnintstr.h X+ sysVCursor.o: ../../../include/screenint.h ../../../include/miscstruct.h X+ sysVCursor.o: ../../../include/region.h ../../../include/pixmap.h X+ sysVCursor.o: ../../../include/gc.h ../../../include/colormap.h X+ sysVCursor.o: ../../../include/cursorstr.h ../../../include/cursor.h OSio.h X+ sysVCursor.o: ../common/ibmScreen.h ../common/ibmIO.h sysVCursor.h X+ sysVCursor.o: ../common/ibmTrace.h X+ sysVEvents.o: /usr/include/sys/types.h /usr/include/sys/times.h X+ sysVEvents.o: ../../../.././X11/X.h ../../../.././X11/Xproto.h X+ sysVEvents.o: ../../../.././X11/Xmd.h ../../../.././X11/Xprotostr.h X+ sysVEvents.o: ../../../include/miscstruct.h ../../../include/misc.h X+ sysVEvents.o: ../../../include/os.h ../../../include/scrnintstr.h X+ sysVEvents.o: ../../../include/screenint.h ../../../include/region.h X+ sysVEvents.o: ../../../include/pixmap.h ../../../include/gc.h X+ sysVEvents.o: ../../../include/colormap.h ../../../include/cursorstr.h X+ sysVEvents.o: ../../../include/cursor.h ../../../include/input.h X+ sysVEvents.o: ../../../include/inputstr.h ../../../include/window.h X+ sysVEvents.o: ../../../include/dixstruct.h ../../../include/dix.h X+ sysVEvents.o: ../../../include/resource.h OScompiler.h OSio.h OScursor.h X+ sysVEvents.o: ../common/ibmIO.h ../common/ibmMouse.h ../common/ibmKeybd.h X+ sysVEvents.o: ../common/ibmScreen.h ../common/ibmCmdArgs.h sysVModKeys.h X+ sysVEvents.o: ../common/ibmTrace.h X+ sysVInit.o: /usr/include/sys/types.h /usr/include/sys/file.h X+ sysVInit.o: /usr/include/sys/fcntl.h /usr/include/sys/vtkd.h X+ sysVInit.o: /usr/include/stdio.h /usr/include/limits.h X+ sysVInit.o: ../../../.././X11/Xmd.h ../../../include/miscstruct.h X+ sysVInit.o: ../../../include/misc.h ../../../include/os.h X+ sysVInit.o: ../../../include/scrnintstr.h ../../../include/screenint.h X+ sysVInit.o: ../../../include/region.h ../../../include/pixmap.h X+ sysVInit.o: ../../../include/gc.h ../../../include/colormap.h X+ sysVInit.o: ../../../include/cursor.h ../common/ibmScreen.h OSio.h X+ sysVInit.o: ../common/ibmTrace.h X+ sysVKeybd.o: /usr/include/stdio.h /usr/include/limits.h X+ sysVKeybd.o: /usr/include/sys/types.h /usr/include/sys/file.h X+ sysVKeybd.o: /usr/include/sys/fcntl.h /usr/include/sys/termio.h X+ sysVKeybd.o: /usr/include/sys/vtkd.h ../../../.././X11/X.h X+ sysVKeybd.o: ../../../.././X11/Xmd.h ../../../include/input.h X+ sysVKeybd.o: ../../../include/misc.h ../../../include/os.h X+ sysVKeybd.o: ../../../include/miscstruct.h ../../../include/scrnintstr.h X+ sysVKeybd.o: ../../../include/screenint.h ../../../include/region.h X+ sysVKeybd.o: ../../../include/pixmap.h ../../../include/gc.h X+ sysVKeybd.o: ../../../include/colormap.h ../../../.././X11/keysym.h X+ sysVKeybd.o: ../../../.././X11/keysymdef.h ../../../include/cursorstr.h X+ sysVKeybd.o: ../../../include/cursor.h sysVModKeys.h sysVKeymap.h X+ sysVKeybd.o: ../common/ibmIO.h ../common/ibmKeybd.h ../common/ibmScreen.h X+ sysVKeybd.o: ../common/ibmTrace.h OSio.h X+ sysVMouse.o: /usr/include/stdio.h /usr/include/limits.h X+ sysVMouse.o: /usr/include/sys/types.h /usr/include/sys/file.h X+ sysVMouse.o: /usr/include/sys/fcntl.h /usr/include/sys/termio.h X+ sysVMouse.o: ../../../.././X11/X.h ../../../.././X11/Xproto.h X+ sysVMouse.o: ../../../.././X11/Xmd.h ../../../.././X11/Xprotostr.h X+ sysVMouse.o: ../../../include/miscstruct.h ../../../include/misc.h X+ sysVMouse.o: ../../../include/os.h ../../../include/scrnintstr.h X+ sysVMouse.o: ../../../include/screenint.h ../../../include/region.h X+ sysVMouse.o: ../../../include/pixmap.h ../../../include/gc.h X+ sysVMouse.o: ../../../include/colormap.h ../../../include/input.h X+ sysVMouse.o: ../../../include/cursorstr.h ../../../include/cursor.h X+ sysVMouse.o: ../common/ibmIO.h ../common/ibmMouse.h ../common/ibmScreen.h X+ sysVMouse.o: ../common/ibmTrace.h OSio.h X*** ./mit-orig/server/ddx/ibm/sysV/OScompiler.h Thu Oct 4 18:02:18 1990 X--- ./mit/server/ddx/ibm/sysV/OScompiler.h Mon Sep 17 10:45:31 1990 X*************** X*** 0 **** X--- 1,79 ---- X+ /* X+ * Copyright IBM Corporation 1987,1988,1989 X+ * X+ * All Rights Reserved X+ * X+ * Permission to use, copy, modify, and distribute this software and its X+ * documentation for any purpose and without fee is hereby granted, X+ * provided that the above copyright notice appear in all copies and that X+ * both that copyright notice and this permission notice appear in X+ * supporting documentation, and that the name of IBM not be X+ * used in advertising or publicity pertaining to distribution of the X+ * software without specific, written prior permission. X+ * X+ * IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING X+ * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL X+ * IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR X+ * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, X+ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, X+ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS X+ * SOFTWARE. X+ * X+ */ X+ /* "@(#)compiler.h 3.1 88/09/22 09:31:34" */ X+ #ifndef __COMPILER_DEPENDANCIES__ X+ #define __COMPILER_DEPENDANCIES__ X+ #ifdef __GNUC__ X+ #define APPEND_STRING(a,b) a##b X+ #else X+ #define APPEND_STRING(a,b) /**/a\ X+ b/**/ X+ #endif X+ #define MOVE( src, dst, length ) memcpy( dst, src, length) X+ #define MAX(a,b) (((a)>(b))?(a):(b)) X+ #define MIN(a,b) (((a)<(b))?(a):(b)) X+ #define ABS(x) (((x)>0)?(x):-(x)) X+ #ifndef __GNUC__ X+ /* So that lint doesn't complain about constructs it doesn't understand */ X+ #ifdef volatile X+ #undef volatile X+ #endif X+ #define volatile X+ #ifdef const X+ #undef const X+ #endif X+ #define const X+ #ifdef signed X+ #undef signed X+ #endif X+ #define signed X+ #ifdef _ANSI_DECLS_ X+ #undef _ANSI_DECLS_ X+ #endif X+ #endif X+ /* X+ * some litte nice inlines X+ */ X+ #ifdef __GNUC__ X+ #define outb(dest,value) \ X+ asm ( "outb (%0)" \ X+ : /* no outputs */ \ X+ : "d" ((unsigned short)(dest)) , "a" (value)) X+ #define outw(dest,value) \ X+ asm ( "outw (%0)" \ X+ : /* no outputs */ \ X+ : "d" ((unsigned short)(dest)) , "a" (value)) X+ #define inb(dest) \ X+ ({ unsigned char __result; \ X+ asm ( "inb (%1)" \ X+ : "=a" (__result) \ X+ : "d" ((unsigned short)(dest))); \ X+ __result; }) X+ #define inw(dest) \ X+ ({ unsigned short __result; \ X+ asm ( "inw (%1)" \ X+ : "=a" (__result) \ X+ : "d" ((unsigned short)(dest))); \ X+ __result; }) X+ #endif X+ #endif END_OF_FILE if test 47977 -ne `wc -c <'fix-14.sco07'`; then echo shar: \"'fix-14.sco07'\" unpacked with wrong size! fi # end of 'fix-14.sco07' fi echo shar: End of archive 7 \(of 12\). cp /dev/null ark7isdone MISSING="" for I in 1 2 3 4 5 6 7 8 9 10 11 12 ; do if test ! -f ark${I}isdone ; then MISSING="${MISSING} ${I}" fi done if test "${MISSING}" = "" ; then echo You have unpacked all 12 archives. echo "instructions are in fix-14.sco01" rm -f ark[1-9]isdone ark[1-9][0-9]isdone else echo You still need to unpack the following archives: echo " " ${MISSING} fi ## End of shell archive. exit 0 dan ---------------------------------------------------- O'Reilly && Associates argv@sun.com / argv@ora.com Opinions expressed reflect those of the author only.