Newsgroups: comp.sys.apollo
From: vds7789@aw101.iasl.ca.boeing.com (Vincent D. Skahan)
Subject: Mosaic-2.5 patches for DomainOS
Organization: none
Date: Wed, 15 Mar 1995 20:26:19 GMT

The following patches are needed to compile Mosaic-2.5 on an HP/Apollo
running the DomainOS operating system.  I've already sent them to
NCSA and asked for inclusion in version 2.6 if possible.  

Basically, the following patches define a _NO_MEMORY_H_ and a _NO_MALLOC_H_
that only Apollo users probably need to get it to compile under the BSD4.3
environment.  You don't want to include either for compiling Mosaic on
Apollos.

Use the following definitions in the master Makefile:

  sysconfigflags =  -D_NO_MEMORY_H_ -D_NO_MALLOC_H_ -DMOTIF1_2 -DMOTIF
  syslibs =
  xinc = -I/usr/include/X11
  xlibs = -lXm -lXmu -lXt -lX11

Compiled on the following:
	DomainOS 10.4.0.11
	Domain CC 6.9
	Domain X11R5
	Domain UEDK 2.0

-- 
 ----------- Vince Skahan ------ vds7789@aw101.iasl.ca.boeing.com -----------
 If I were to judge from the mail I get, I would say the aerospace industry
 is the saddest.  I get the most mail from people who say 'I am living the
 life of Dilbert' from people who work at Boeing..."    --- Scott Addams



################# apollo-specific patches to Mosaic 2.5 follow ##########
*** libhtmlw/HTML-PSformat.c-original	Wed Mar 15 09:27:19 1995
--- libhtmlw/HTML-PSformat.c	Wed Mar 15 09:27:51 1995
***************
*** 47,53 ****
--- 47,55 ----
  #include <stdio.h>
  #include <ctype.h>
  #include <math.h>
+ #ifndef _NO_MALLOC_H_
  #include <malloc.h>
+ #endif
  #include "HTMLP.h"
  
  /* Fix thanks to robm. */
*** src/accept.c-original	Wed Mar 15 08:45:18 1995
--- src/accept.c	Wed Mar 15 09:05:57 1995
***************
*** 8,14 ****
--- 8,16 ----
  #include <sys/ioctl.h>
  
  /*For memset*/
+ #ifndef _NO_MEMORY_H_
  #include <memory.h>
+ #endif
  
  #ifdef MOTOROLA
  #include <sys/filio.h>
*** src/globalhist.c-original	Wed Mar 15 08:45:38 1995
--- src/globalhist.c	Wed Mar 15 09:06:09 1995
***************
*** 57,63 ****
--- 57,65 ----
  #include <time.h>
  
  /*for memset*/
+ #ifndef _NO_MEMORY_H_
  #include <memory.h>
+ #endif
  
  extern char *cached_url;
  
*** src/grpan-www.c-original	Wed Mar 15 08:46:19 1995
--- src/grpan-www.c	Wed Mar 15 09:06:23 1995
***************
*** 55,61 ****
--- 55,63 ----
  #include "mosaic.h"
  
  /*for memcpy*/
+ #ifndef _NO_MEMORY_H_
  #include <memory.h>
+ #endif
  
  #if 0
  
*** src/history.c-original	Wed Mar 15 09:34:37 1995
--- src/history.c	Wed Mar 15 09:35:02 1995
***************
*** 59,65 ****
--- 59,67 ----
  #include "libhtmlw/HTML.h"
  
  /*for memcpy*/
+ #ifndef _NO_MEMORY_H_
  #include <memory.h>
+ #endif
  
  extern Display *dsp;
  
*** src/mo-www.c-original	Wed Mar 15 09:02:38 1995
--- src/mo-www.c	Wed Mar 15 09:31:51 1995
***************
*** 56,63 ****
  #include <ctype.h>
  
  /*for memcpy*/
  #include <memory.h>
! 
  /* Grumble grumble... */
  #if defined(__sgi) && !defined(__STDC__)
  #define __STDC__
--- 56,64 ----
  #include <ctype.h>
  
  /*for memcpy*/
+ #ifndef _NO_MEMORY_H_
  #include <memory.h>
! #endif
  /* Grumble grumble... */
  #if defined(__sgi) && !defined(__STDC__)
  #define __STDC__
*** src/pan.c-original	Wed Mar 15 09:03:15 1995
--- src/pan.c	Wed Mar 15 09:03:58 1995
***************
*** 59,65 ****
--- 59,67 ----
  #include "libhtmlw/HTML.h"
  
  /*for memset*/
+ #ifndef _NO_MEMORY_H_
  #include <memory.h>
+ #endif
  
  #ifndef S_IRUSR
  #define S_IRUSR 400
*** src/pixmaps.c-original	Wed Mar 15 09:04:10 1995
--- src/pixmaps.c	Wed Mar 15 09:04:24 1995
***************
*** 56,63 ****
  #include "pixmaps.h"
  
  /*for memcpy*/
  #include <memory.h>
! 
  extern unsigned char *ProcessXpm3Data();
  
  
--- 56,64 ----
  #include "pixmaps.h"
  
  /*for memcpy*/
+ #ifndef _NO_MEMORY_H_
  #include <memory.h>
! #endif
  extern unsigned char *ProcessXpm3Data();
  
  
*** src/support.c-original	Wed Mar 15 09:04:43 1995
--- src/support.c	Wed Mar 15 09:04:57 1995
***************
*** 2,8 ****
--- 2,10 ----
  #include <string.h>
  
  /*for memcpy*/
+ #ifndef _NO_MEMORY_H_
  #include <memory.h>
+ #endif
  
  #include "cci.h"
  
*** src/xpmread.c-original	Wed Mar 15 09:05:11 1995
--- src/xpmread.c	Wed Mar 15 09:05:34 1995
***************
*** 91,97 ****
--- 91,99 ----
  #include "xpm.h"
  
  /*for memset*/
+ #ifndef _NO_MEMORY_H_
  #include <memory.h>
+ #endif
  
  extern Display *dsp;

########################## end of patches #######################  

-- 
 ----------- Vince Skahan ------ vds7789@aw101.iasl.ca.boeing.com -----------
 If I were to judge from the mail I get, I would say the aerospace industry
 is the saddest.  I get the most mail from people who say 'I am living the
 life of Dilbert' from people who work at Boeing..."    --- Scott Addams