debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove apollo support

Browse Source
This commit is contained in:
chase
2018-06-24 14:15:00 -05:00
committed by Jon Trulson
parent 01c9b8889b
commit 6bf175ef2d
108 changed files with 59 additions and 2185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cde/lib/DtSvc/DtCodelibs/pathcollapse.C
View File

@@ -31,9 +31,6 @@
* (c) Copyright 1996 FUJITSU LIMITED.
* (c) Copyright 1996 Hitachi.
*/
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#include <stdio.h>
#include <stdlib.h>
@@ -60,9 +57,6 @@ pathcollapse(const char *src, char *dst, boolean show_dir)
char **comp = components;
int length = src == NULL ? 0 : strlen(src);
int dir_comp; /* TRUE if last component was . or .. */
#ifdef apollo
int double_slash = 0;
#endif
wchar_t __nlh_char[1];
if (length == 0 || length > MAXPATHLEN)
@@ -75,19 +69,6 @@ pathcollapse(const char *src, char *dst, boolean show_dir)
if ((dst = (char *)malloc(length + 1)) == NULL)
return NULL;
#ifdef apollo
/*
* On apollo, a leading double-slash must be preserved, so we
* copy the first slash and hide it from the rest of the code.
*/
if (CHARAT(src) == '/' && CHARAT(src + 1) == '/')
{
*dst++ = '/';
src++;
double_slash = 1;
}
#endif
srcp = src;
dstp = dst;
@@ -175,10 +156,5 @@ pathcollapse(const char *src, char *dst, boolean show_dir)
else if (sep > dst)
*sep = '\0'; /* remove trailing '/' */
#ifdef apollo
if (double_slash)
dst--;
#endif
return dst;
}

22
cde/lib/DtSvc/DtCodelibs/shellscan.C
View File

@@ -31,15 +31,6 @@
* (c) Copyright 1996 FUJITSU LIMITED.
* (c) Copyright 1996 Hitachi.
*/
# if defined(apollo) && !defined(___GID_T)
// This kludge is needed for the include conflicts mentioned below
// Remove when no longer necessary
# define _NEED___PID_T
# endif
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#include <stdio.h>
#include <stdlib.h>
@@ -49,20 +40,7 @@
#include <X11/Xos_r.h>
#include <codelibs/nl_hack.h>
#ifdef apollo
// This kludge because of include conflicts between stdlib.h and unistd.h
// Remove when problem is fixed
# ifdef __cplusplus
extern "C" {
# endif
_DECL_FUNC(__pid_t, getpid, (void))
# ifdef __cplusplus
}
# endif
#else /* not apollo */
# include <unistd.h>
#endif /* not apollo */
#include "stringio.h"
#include "buf.h"

4
cde/lib/DtSvc/DtEncap/MemoryMgr.c
View File

@@ -32,10 +32,6 @@
* (c) Copyright 1993, 1994 Novell, Inc. *
*/
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#include <Dt/UserMsg.h>
#include <bms/sbport.h> /* NOTE: sbport.h must be the first include. */

4
cde/lib/DtSvc/DtEncap/pty.c
View File

@@ -61,10 +61,6 @@
#include <sys/ptyio.h>
#endif
#if defined(__apollo) && !defined(ONLCR)
# define ONLCR 0 /* This guy (XPG3), not on apollo yet */
#endif
#ifdef __bsd
#include <sys/file.h>
#include <sgtty.h>

4
cde/lib/DtSvc/DtEncap/scoop.c
View File

@@ -32,10 +32,6 @@
* (c) Copyright 1993, 1994 Novell, Inc. *
*/
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#include <bms/sbport.h> /* This must be the first file included */
#include <bms/scoop.h>

50
cde/lib/DtSvc/DtEncap/usersig.c
View File

@@ -90,55 +90,55 @@ static void Xe_init_sig_table(void)
/* Now add signals that may or may not be around on a given platform */
# ifdef SIGIO
Xe_addsig((XeString)"SIGIO", SIGIO); /* hpux sun apollo */
Xe_addsig((XeString)"SIGIO", SIGIO); /* hpux sun */
# else
# ifdef SIGPOLL
Xe_addsig((XeString)"SIGIO", SIGPOLL); /* hpux sun apollo */
Xe_addsig((XeString)"SIGIO", SIGPOLL); /* hpux sun */
# endif
# endif
# ifdef SIGPOLL
Xe_addsig((XeString)"SIGPOLL", SIGPOLL); /* hpux sun apollo */
Xe_addsig((XeString)"SIGPOLL", SIGPOLL); /* hpux sun */
# else
# ifdef SIGIO
Xe_addsig((XeString)"SIGPOLL", SIGIO); /* hpux sun apollo */
Xe_addsig((XeString)"SIGPOLL", SIGIO); /* hpux sun */
# endif
# endif
# ifdef SIGEMT
Xe_addsig((XeString)"SIGEMT", SIGEMT); /* hpux sun apollo */
Xe_addsig((XeString)"SIGEMT", SIGEMT); /* hpux sun */
# endif
# ifdef SIGBUS
Xe_addsig((XeString)"SIGBUS", SIGBUS); /* hpux sun apollo */
Xe_addsig((XeString)"SIGBUS", SIGBUS); /* hpux sun */
# endif
# ifdef SIGIOT
Xe_addsig((XeString)"SIGIOT", SIGIOT); /* hpux sun apollo */
Xe_addsig((XeString)"SIGIOT", SIGIOT); /* hpux sun */
# endif
# ifdef SIGURG
Xe_addsig((XeString)"SIGURG", SIGURG); /* hpux sun apollo */
Xe_addsig((XeString)"SIGURG", SIGURG); /* hpux sun */
# endif
# ifdef SIGSYS
Xe_addsig((XeString)"SIGSYS", SIGSYS); /* hpux sun apollo */
Xe_addsig((XeString)"SIGSYS", SIGSYS); /* hpux sun */
# endif
# ifdef SIGTRAP
Xe_addsig((XeString)"SIGTRAP", SIGTRAP); /* hpux sun apollo */
Xe_addsig((XeString)"SIGTRAP", SIGTRAP); /* hpux sun */
# endif
# ifdef SIGPROF
Xe_addsig((XeString)"SIGPROF", SIGPROF); /* hpux sun apollo */
Xe_addsig((XeString)"SIGPROF", SIGPROF); /* hpux sun */
# endif
# ifdef SIGCLD
Xe_addsig((XeString)"SIGCLD", SIGCLD); /* hpux sun apollo */
Xe_addsig((XeString)"SIGCLD", SIGCLD); /* hpux sun */
# endif
# ifdef SIGVTALRM
Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM); /* hpux sun apollo */
Xe_addsig((XeString)"SIGVTALRM", SIGVTALRM); /* hpux sun */
# endif
# ifdef SIGWINCH
@@ -204,60 +204,60 @@ XeString XeSignalToName(int sig)
/* code to the stuff in Xe_init_sig_table() above, you see a one */
/* to one correspondance. */
# ifdef SIGIO /* hpux sun apollo */
# ifdef SIGIO /* hpux sun */
/* (SIGPOLL, SIGTINT are aliases) */
case SIGIO: return (XeString)"SIGIO";
# endif
# ifdef SIGPOLL /* hpux sun apollo */
# ifdef SIGPOLL /* hpux sun */
/* ----> Duplicated by SIGIO above
case SIGPOLL: return (XeString)"SIGPOLL";
*/
# endif
# ifdef SIGEMT /* hpux sun apollo */
# ifdef SIGEMT /* hpux sun */
case SIGEMT: return (XeString)"SIGEMT";
# endif
# ifdef SIGBUS /* hpux sun apollo */
# ifdef SIGBUS /* hpux sun */
case SIGBUS: return (XeString)"SIGBUS";
# endif
# ifdef SIGIOT /* hpux sun apollo */
# ifdef SIGIOT /* hpux sun */
/* ----> Duplicated by SIGABRT above
case SIGIOT: return (XeString)"SIGIOT";
*/
# endif
# ifdef SIGURG /* hpux sun apollo */
# ifdef SIGURG /* hpux sun */
case SIGURG: return (XeString)"SIGURG";
# endif
# ifdef SIGSYS /* hpux sun apollo */
# ifdef SIGSYS /* hpux sun */
case SIGSYS: return (XeString)"SIGSYS";
# endif
# ifdef SIGTRAP /* hpux sun apollo */
# ifdef SIGTRAP /* hpux sun */
case SIGTRAP: return (XeString)"SIGTRAP";
# endif
# ifdef SIGPROF /* hpux sun apollo */
# ifdef SIGPROF /* hpux sun */
case SIGPROF: return (XeString)"SIGPROF";
# endif
# ifdef SIGCLD /* hpux sun apollo */
# ifdef SIGCLD /* hpux sun */
/* ----> Duplicated by SIGCHLD above
case SIGCLD: return (XeString)"SIGCLD";
*/
# endif
# ifdef SIGVTALRM /* hpux sun apollo */
# ifdef SIGVTALRM /* hpux sun */
case SIGVTALRM: return (XeString)"SIGVTALRM";
# endif
# ifdef SIGWINCH /* sun apollo */
# ifdef SIGWINCH /* sun */
case SIGWINCH: return (XeString)"SIGWINCH";
# endif

4
cde/lib/DtSvc/DtUtil1/CmdMain.c
View File

@@ -40,11 +40,7 @@
#include <Dt/CmdInv.h>
#include <fcntl.h>
#ifdef __apollo
#include "/sys5/usr/include/sys/termio.h"
#else
#include <termios.h>
#endif
#include <errno.h>
#include <unistd.h>
#include <sys/stat.h>

5
cde/lib/DtSvc/DtUtil1/CmdUtilityP.c
View File

@@ -37,12 +37,7 @@
#include <stdio.h>
#include <sys/param.h>
#ifdef __apollo
#include "/sys5/usr/include/unistd.h"
#else
#include <unistd.h>
#endif
#include <limits.h>
#include <sys/stat.h>

4
cde/lib/DtSvc/DtUtil2/CmdUtility.c
View File

@@ -37,11 +37,7 @@
#include <string.h>
#include <sys/param.h>
#ifdef __apollo
#include "/sys5/usr/include/unistd.h"
#else
#include <unistd.h>
#endif
#include <limits.h>
#include <sys/stat.h>

2
cde/lib/DtSvc/DtUtil2/DtosP.h
View File

@@ -160,7 +160,7 @@ static char SCCSID[] = "OSF/Motif: @(#)_DtosP.h 4.16 91/09/12";
/*
* warning: mips alloca is unsuitable, do not use.
*/
# if defined(vax) || defined(sun) || defined(apollo) || defined(stellar)
# if defined(vax) || defined(sun) || defined(stellar)
/*
* Some System V boxes extract alloca.o from /lib/libPW.a; if you
* decide that you don't want to use alloca, you might want to fix it here.

76
cde/lib/DtSvc/include/bms/sbport.h
View File

@@ -46,7 +46,6 @@
__hpux - Will be set for HP-UX systems
__sun - Will be set for SUN systems
__apollo - Will be set for APOLLO (domain) systems
__aix - Will be set for IBM (AIX) systems
__sysv - Set when using SYSV semantics (e.g. HP, SUN)
@@ -62,13 +61,6 @@
__sparc - Set for SUN sparc machines
__sun68k - Set for SUN m68k machines
__apollo88k - Set for apollo (domain) risc (PRISM) machines
__apollo68k - Set for apollo (domain) m68k machines
__apollo_null - Set to allow null pointer dereferences on domain
__apollo_paths - Set to have "//<host>" converted to "host:"
__identification_strings - Set when RCS header strings are to be in code
__recursive_includes - Set to have .h files #includes prerequisite files
__char_ptr_yytext - Set if the lex/yacc variable yytext is defined
@@ -96,10 +88,6 @@
# define __sun
#endif
#if defined(apollo) && !defined(__apollo)
# define __apollo
#endif
#if defined(hpux) && !defined(__hpux)
# define __hpux
#endif
@@ -135,32 +123,6 @@
# define __c_callable /* Set so VUE can link with libbms. */
#endif
#ifdef __apollo
# ifndef __bsd
# define __sysv /* NOTE: not bsd!!! */
# endif
# ifndef __apollo_paths
# define __apollo_paths
# endif
# ifndef __apollo_null
# define __apollo_null
# endif
# if defined(a88k) && !defined(__apollo88k)
# define __apollo88k
# endif
# if defined(_ISP__A88K) && !defined(__apollo88k)
# define __apollo88k
# endif
# if defined(m68k) && !defined(__apollo68k)
# define __apollo68k
# endif
# if defined(_ISP__M68K) && !defined(__apollo68k)
# define __apollo68k
# endif
# define __hp_color_object
# define __unsigned_char_ptr_yytext
#endif
#ifdef __aix
# define __sysv
#endif
@@ -173,11 +135,6 @@
# define KEEP_DEADWOOD FALSE /* all sorts of unknown problems. */
#endif
#ifndef __apollo_paths
# define __apollo_paths /* We always want this feature */
#endif
#ifdef __cplusplus
#define UNUSED_PARM(_parm)
@@ -207,49 +164,18 @@
/* ----------------------------------------------------------------- */
#if defined(__need_timeval) /* Get "struct timeval" */
# ifdef __sun
# include <sys/time.h>
# endif
# ifdef __apollo
# include <sys/time.h>
# endif
# ifdef __aix
# if defined(__sun) || defined(__aix)
# include <sys/time.h>
# endif
#endif /* __need_timeval */
#if defined(__need_fd_set) /* Get "typedef struct fd_set" */
# ifdef __apollo
# define _INCLUDE_BSD_SOURCE
# include "/bsd4.3/usr/include/sys/types.h"
# endif
# ifdef _AIX
# include <sys/select.h>
# endif
#endif /* __need_fd_st */
#if defined(__need_S_IF) /* Get S_IFNWK, S_IFLNK */
# ifdef __apollo
# define _APOLLO_SOURCE
# endif
#endif /* __need_S_IF */
#if defined(__need_all_errors)
# ifdef __apollo
# define _APOLLO_SOURCE
# undef _SYS_STDSYMS_INCLUDED /* So we can include <sys/stdsyms.h> again */
# endif
#endif
#if defined(__need_all_signals) /* Get all SIGxxx values */
# ifdef __apollo
# define _APOLLO_SOURCE
# include "/bsd4.3/usr/include/sys/types.h"
# endif
#endif /* __need_all_signal */
/* We also use the following non XPG3 types. However, they may be */
/* defined when we relax the XPG3 compliance to get the stuff talked */
/* about above. So, declare them only if we don't already have them */

4
cde/lib/DtSvc/include/bms/sbstdinc.h
View File

@@ -58,8 +58,8 @@
/* Routines not defined in include files (yet). */
/************************************************************************/
/* Domain/OS BSD has bzero(), bcmp(), and bcopy() defined. */
#if !(defined(apollo) && defined(__bsd)) && !defined(CSRG_BASED)
/* BSD has bzero(), bcmp(), and bcopy() defined. */
#if !defined(__bsd) && !defined(CSRG_BASED)
#if defined(__STDC__)
#if !defined(__linux__) && !defined(_XFUNCS_H_) && !defined(sun)

5
cde/lib/DtSvc/include/codelibs/mbstring.h
View File

@@ -34,11 +34,6 @@
#include <stddef.h>
#ifdef apollo
#define _NEED_WCHAR_T
#include <sys/stdtypes.h>
#endif
#ifdef __cplusplus
extern "C"
{

7
cde/lib/DtSvc/include/codelibs/privbuf.h
View File

@@ -34,13 +34,6 @@
#ifndef __PRIVBUF_H_
#define __PRIVBUF_H_
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#ifdef apollo
#include <stdlib.h>
#endif
typedef void (*privbuf_func)(void *v);
#ifdef __PRIVATE_

11
cde/lib/DtSvc/include/codelibs/stringx.h
View File

@@ -32,13 +32,6 @@
#ifndef __STRINGX_H_
#define __STRINGX_H_
#ifdef DOMAIN_ALLOW_MALLOC_OVERRIDE
#include "/usr/include/apollo/shlib.h"
#endif
#ifdef apollo
#include <stdlib.h>
#endif
#include <stddef.h>
#include <string.h>
#include <codelibs/boolean.h>
@@ -119,11 +112,11 @@ extern size_t nl_strlen(); /* __OBSOLETE */
#if defined(__cplusplus)
}
#if defined(apollo) || defined(__aix) || defined(__linux__) || defined(CSRG_BASED)
#if defined(__aix) || defined(__linux__) || defined(CSRG_BASED)
#include <stdlib.h>
#else
#include <malloc.h>
#endif /* apollo */
#endif /* aix linux CSRG_BASED */
inline char *strnew(size_t len) { return (char*)malloc(len + 1); }
#if defined(sun) || defined(__sun)

4
cde/lib/DtWidget/Control.c
View File

@@ -47,11 +47,7 @@
*/
#include <stdio.h>
#ifdef __apollo
#include <sys/types.h> /* needed for sys/stat.h on bsd4.3 */
#else
#include <stdlib.h>
#endif
#include <sys/stat.h>
#define X_INCLUDE_STRING_H
#define X_INCLUDE_TIME_H

3
cde/lib/DtWidget/Icon.c
View File

@@ -47,9 +47,6 @@
*/
#include <stdio.h>
#ifdef __apollo
#include <sys/types.h>
#endif
#include <sys/stat.h>
#include <X11/Xatom.h>
#include <Xm/XmP.h>