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

Remove UXPDS support

Browse Source
This commit is contained in:
chase
2018-05-15 20:11:08 -05:00
committed by Jon Trulson
parent 0f8233dadd
commit 8a4f389634
319 changed files with 317 additions and 8776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/lib/tt/bin/shell/mover.C
View File

@@ -38,7 +38,7 @@
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#include <unistd.h>
#else
#if !defined(USL) && !defined(__uxp__) && !defined(sun)
#if !defined(USL) && !defined(sun)
#include <osfcn.h>
#endif
#endif
@@ -49,7 +49,7 @@
#define S_ISLNK(m) (((m)&IFMT) == IFLNK)
#endif
#include <sys/stat.h>
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
#endif
#include <sys/wait.h>

4
cde/lib/tt/bin/shell/remover.C
View File

@@ -38,7 +38,7 @@
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
#include <unistd.h>
#else
#if !defined(USL) && !defined(__uxp__) && !defined(sun)
#if !defined(USL) && !defined(sun)
#include <osfcn.h>
#endif
#endif
@@ -49,7 +49,7 @@
#define S_ISLNK(m) (((m)&IFMT) == IFLNK)
#endif
#include <sys/stat.h>
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
#endif
#include <sys/wait.h>

4
cde/lib/tt/bin/tt_type_comp/mp_type_comp.C
View File

@@ -45,9 +45,9 @@
#if defined(sgi) || defined(CSRG_BASED)
#include <getopt.h>
#endif
#if defined(USL) || defined(__uxp__)
#if defined(USL)
#include "tt_options.h"
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
extern "C" int getopt(int, char *const *, const char *);
#endif
#endif

4
cde/lib/tt/bin/tt_type_comp/mp_types_table.C
View File

@@ -50,11 +50,9 @@
#include <unistd.h>
#include <ctype.h>
#if defined(OPT_BUG_UW_2) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_UW_2)
extern "C" {
#ifndef __uxp__
int putenv(char *);
#endif
FILE *popen(const char *, const char *);
FILE *fdopen(int, const char *);
int pclose(FILE *);

4
cde/lib/tt/bin/ttdbserverd/db_server_functions.C
View File

@@ -80,7 +80,7 @@ char **global_envp;
// This is the PID or TID of the procedure that is
// performing the garbage collection.
//
#if defined(USL) || defined(__uxp__)
#if defined(USL)
int _tt_garbage_id = 0; // TID or PID.
#else
int _tt_garbage_id = -1; // TID or PID.
@@ -2737,7 +2737,7 @@ _tt_run_garbage_collect(int in_parallel)
//
// FORK and EXEC ourself '-G'.
//
#if defined(OPT_BUG_AIX) || defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_AIX) || defined(OPT_BUG_USL)
#define vfork fork
#endif
switch (_tt_garbage_id = (int)vfork()) {

4
cde/lib/tt/bin/tttar/tttar.C
View File

@@ -40,7 +40,7 @@
#if defined(__osf__) || defined(linux) || defined(sun) || defined(CSRG_BASED)
#include <unistd.h>
#else
#if !defined(USL) && !defined(__uxp__) && !defined(sun)
#if !defined(USL) && !defined(sun)
#include <osfcn.h>
#endif
#endif
@@ -52,7 +52,7 @@
#include "tt_options.h"
#include "archiver.h"
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
#include <unistd.h>
#endif

2
cde/lib/tt/bin/tttar/tttar_file_utils.C
View File

@@ -45,7 +45,7 @@
#include <dirent.h>
#include "tttar_utils.h"
#include "tttar_file_utils.h"
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
#endif

6
cde/lib/tt/bin/tttar/tttar_spec.C
View File

@@ -35,13 +35,13 @@
#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <unistd.h>
#else
#if defined (USL) || defined(__uxp__)
#if defined (USL)
#include "tt_options.h"
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
#include <unistd.h>
#else
#include <osfcn.h>
#endif /* if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP) */
#endif /* if defined(OPT_BUG_USL) */
#else
#include <osfcn.h>
#endif

2
cde/lib/tt/lib/mp/mp_c_session.C
View File

@@ -268,7 +268,7 @@ startup_ttsession(_Tt_string &start_ttcmd)
#endif
SIG_PF istat, qstat, cstat;
#if defined(_AIX) || defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(_AIX) || defined(OPT_BUG_USL)
#define vfork fork
#endif
if((pid = vfork()) == 0) {

6
cde/lib/tt/lib/mp/mp_rpc_client.C
View File

@@ -310,7 +310,7 @@ call(int procnum, xdrproc_t inproc, char *in,
}
}
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
if (timeout <= 0)
{
outproc = (xdrproc_t) NULL;
@@ -328,7 +328,7 @@ call(int procnum, xdrproc_t inproc, char *in,
#if defined(OPT_BUG_SUNOS_5) || defined(OPT_BUG_UW_1)
if ((SIG_TYP)curr_action.sa_handler == SIG_DFL)
#else
#if defined(OPT_BUG_UW_2) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_UW_2)
if ((void(*)(int))curr_action.sa_handler == SIG_DFL)
#else
if (curr_action.sa_handler == SIG_DFL)
@@ -357,7 +357,7 @@ call(int procnum, xdrproc_t inproc, char *in,
outproc, out,
total_timeout);
}
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
if (timeout <= 0)
{
total_timeout.tv_sec = 10;

41
cde/lib/tt/lib/tt_options.h
View File

@@ -80,9 +80,6 @@
* OPT_BUG_SGI -- used to flag special hacks only needed because of
* bugs or quirks in SGI IRIX.
*
* OPT_BUG_UXP -- used to flag special hacks only needed because of
* bugs or quirks in Fujitsu's UXP.
*
* OPT_BUG_USL -- used to flag special hacks only needed because of
* bugs or quirks in UnixWare, etc.
*
@@ -457,44 +454,6 @@
# define OPT_TAR_HAS_EXCLUDE_OPTION
# define OPT_HAS_REALPATH
#elif defined(__uxp__)
# if !defined(__STDIO_H)
# include <stdio.h>
# endif
# undef OPT_UNIX_SOCKET_RPC
# define OPT_TLI
# if defined(PROF) /* can't use dlopen if profiling. */
# undef OPT_DLOPEN_X11
# undef OPT_DLOPEN_CE
# else
# define OPT_DLOPEN_X11
# define OPT_DLOPEN_CE
# endif
# undef OPT_ADDMSG_DIRECT
# undef OPT_SECURE_RPC
# undef OPT_CLASSING_ENGINE
# undef OPT_BSD_SIGNAL
# define OPT_POSIX_SIGNAL
# undef OPT_BSD_WAIT
# undef OPT_DGETTEXT
# define OPT_CATGETS
# undef OPT_GETDTABLESIZE
# define OPT_SYSINFO
# define OPT_STRERROR
# define OPT_CPP_PATH "/usr/ccs/lib/cpp"
# define OPT_CPP_OPTIONS ""
# define OPT_SVR4_GETMNTENT
/* the reason for locking MNTENT is to sync with the Solaris automounter,
* which doesn't apply on UnixWare. It probably wouldn't hurt to
* do the lockf there, but things seem to be working without it...
*/
# undef OPT_LOCKF_MNTENT
# define OPT_BUG_UXP
# define OPT_LOCAL_MOUNT_TYPE "vxfs"
# define OPT_DEFINE_SIG_PF
# define OPT_TAR_HAS_EXCLUDE_OPTION
# define OPT_HAS_REALPATH
#elif defined(__osf__)
# define OPT_UNIX_SOCKET_RPC
# undef OPT_TLI

2
cde/lib/tt/lib/util/tt_host.C
View File

@@ -48,7 +48,7 @@ extern "C" in_addr_t inet_addr(const char *);
#ifdef __osf__
#include <unistd.h>
#else
#if !defined(USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#if !defined(USL) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <osfcn.h>
#endif
#endif /* __osf */

6
cde/lib/tt/lib/util/tt_log.C
View File

@@ -37,7 +37,7 @@
#ifdef __osf__
#include <unistd.h>
#else
#if !defined (USL) && !defined(__uxp__) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#if !defined (USL) && !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <osfcn.h>
#endif
#endif /* __osf__ */
@@ -46,9 +46,9 @@
#define XOS_USE_XT_LOCKING
#include <X11/Xos_r.h>
#if defined (USL) || defined(__uxp__)
#if defined (USL)
#include <tt_options.h>
#if defined(OPT_BUG_UW_2) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_UW_2)
#include <unistd.h>
#endif
#endif

2
cde/lib/tt/lib/util/tt_path.C
View File

@@ -59,7 +59,7 @@
#undef rindex
#endif
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
#define S_ISLNK(mode) ((mode & 0xF000) == S_IFLNK)
#endif

4
cde/lib/tt/lib/util/tt_port.C
View File

@@ -259,7 +259,7 @@ _tt_sigset(
struct sigaction act;
#if defined(OPT_BUG_SUNOS_5)
act.sa_sigaction = (void (*)(int, siginfo_t *, void *)) handler;
#elif defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#elif defined(OPT_BUG_USL)
act.sa_handler = (void (*)()) handler;
#else
act.sa_handler = handler;
@@ -377,7 +377,7 @@ _tt_vsyslog(
return;
}
#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX) || defined(OPT_BUG_USL) || defined(OPT_BUG_UXP) || defined(__osf__)
#if defined(OPT_BUG_AIX) || defined(OPT_BUG_HPUX) || defined(OPT_BUG_USL) || defined(__osf__)
char buf[5000];
vsprintf( buf, _format, args );
syslog( priority, buf );

2
cde/lib/tt/lib/util/tt_port.h
View File

@@ -63,7 +63,7 @@
typedef void (*SIG_PF)(int);
#endif
#if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_USL)
#if !defined(MNTTYPE_NFS)
#define MNTTYPE_NFS "nfs"
#endif

2
cde/lib/tt/lib/util/tt_string.h
View File

@@ -48,7 +48,7 @@
extern "C" {
#include <wchar.h>
};
#elif defined(OPT_BUG_SUNOS_5) || defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#elif defined(OPT_BUG_SUNOS_5) || defined(OPT_BUG_USL)
#include <widec.h>
#include <wctype.h>
#elif defined(OPT_BUG_AIX)

2
cde/lib/tt/lib/util/tt_xdr_utils.C
View File

@@ -147,7 +147,7 @@ _Tt_xdr_size_stream() {
ops.x_putlong = tt_x_putlong;
ops.x_putbytes = tt_x_putbytes;
ops.x_inline = (inline_t *(*)(...))tt_x_inline;
#elif defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
#elif defined(OPT_BUG_USL)
ops.x_putlong = tt_x_putlong;
ops.x_putbytes = (bool_t (*)(XDR *, caddr_t, u_int)) tt_x_putbytes;
#if defined(OPT_BUG_UW_1)

4
cde/lib/tt/slib/mp_rpc_server.C
View File

@@ -48,10 +48,10 @@
#if defined(OPT_TLI)
#include <netdir.h>
static int gettransient(int, netconfig *, netbuf *);
#if defined(OPT_BUG_SUNOS_5) || defined(OPT_BUG_UXP)
#if defined(OPT_BUG_SUNOS_5)
extern "C" { char * nc_sperror(); }
#endif
# if defined(OPT_BUG_USL) || defined(OPT_BUG_UXP)
# if defined(OPT_BUG_USL)
extern int t_errno;
extern char *t_strerror(int t_errno);
# endif