OpenIndiana and Solaris port

This commit is contained in:
Ulrich Wilkens
2014-10-28 19:46:43 +01:00
committed by Jon Trulson
parent 42e891d9e7
commit 01d6c363fa
296 changed files with 1049 additions and 1091 deletions

View File

@@ -13,7 +13,8 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 drk $
#define IHaveSubdirs
#define PassCDebugFlags /**/
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \
defined(SunArchitecture)
SUBDIRS = il
DONES = il/DONE
#else
@@ -34,7 +35,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
#endif
INCLUDES = -I. -I./il -I./jpeg
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -DDTLIB $(LOCAL_DEFINES) \
-DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
-DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@@ -153,7 +154,8 @@ JPEG_OBJS = \
jpeg/jdinput.o jpeg/jerror.o jpeg/jutils.o
SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \
defined(SunArchitecture)
OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
#else
OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)

View File

@@ -191,6 +191,13 @@
! So the pattern string must be 23, not 32. Do not go by
! the order of 'uname -rv' or 'uname -vr', as that is not used.
!!!
SunOS.?.version.<.5120: "5\\.12.*"
SunOS.?.version.<.5110: "5\\.11.*"
SunOS.?.version.<.5100: "5\\.10.*"
SunOS.?.version.<.590: "5\\.9.*"
SunOS.?.version.<.580: "5\\.8.*"
SunOS.?.version.<.570: "5\\.7.*"
SunOS.?.version.<.560: "5\\.6.*"
SunOS.?.version.<.550: "5\\.5.*"
SunOS.?.version.<.540: "5\\.4.*"
SunOS.?.version.<.530: "5\\.3.*"

View File

@@ -16,6 +16,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
#endif
INCLUDES = -I. -I..
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -DDTLIB $(LOCAL_DEFINES) \
-DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
-DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \

View File

@@ -14,6 +14,7 @@ XCOMM $XConsortium: Imakefile /main/2 1996/04/21 19:14:49 drk $
REQUIREDLIBS = SharedDtMrmReqs
#endif
DEPEND_DEFINES = $(DEPENDDEFINES)
INCLUDES = -I. -I$(DTHELPSRC) -I$(DTTERMSRC)/Term -I$(DTTERMSRC)/TermPrim

View File

@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/11 1996/10/31 02:09:04 cde-hp $
#ifndef DtPrintDefines
# define DtPrintDefines -DMULTIBYTE -DI18N_MSG
#endif
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = DtPrintDefines
INCLUDES = -I.

View File

@@ -17,6 +17,10 @@ EXTRA_DEFINES = -DBYTE_SWAP
EXTRA_DEFINES = -DBYTE_SWAP
#endif
#if defined(SunArchitecture)
EXTRA_DEFINES = -DBYTE_SWAP
#endif
MakeSubdirs($(SUBDIRS))
ForceSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))

View File

@@ -27,6 +27,10 @@ EXTRA_DEFINES = -D_XOPEN_SOURCE
EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
#endif
#if defined(SunArchitecture)
EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
#endif
#define DoNormalLib NormalLibDtSearch
#define DoSharedLib SharedLibDtSearch
#define DoDebugLib DebugLibDtSearch

View File

@@ -86,7 +86,7 @@
# define __SVR4_I386_ABI_L1__
#endif
#include <limits.h> /* pickup WORD_BIT, LONG_BIT */
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
# undef __SVR4_I386_ABI_L1__
# ifndef WORD_BIT
# define WORD_BIT 32

View File

@@ -21,6 +21,7 @@ XCOMM (c) Copyright 1996 Hitachi.
#ifndef DtSvcDefines
# define DtSvcDefines -DMULTIBYTE
#endif
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = DtSvcDefines \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \

View File

@@ -14,6 +14,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/08/20 14:48:27 drk $
#ifndef DtSvcDefines
# define DtSvcDefines -DMULTIBYTE
#endif
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = DtSvcDefines \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"

View File

@@ -13,6 +13,7 @@ XCOMM $TOG: Imakefile /main/14 1998/04/22 14:18:31 mgreess $
#ifndef DtSvcDefines
# define DtSvcDefines -DMULTIBYTE
#endif
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = DtSvcDefines \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"

View File

@@ -30,8 +30,10 @@ INCLUDES = -I.
#ifdef SharedDtSvcReqs
#ifdef SunArchitecture
REQUIREDLIBS = SharedDtSvcReqs -lC -lCrun
REQUIREDLIBS = SharedDtSvcReqs
#ifndef HasGcc2
SHLIBLDFLAGS = -G
#endif
#else
REQUIREDLIBS = SharedDtSvcReqs
#endif

View File

@@ -36,7 +36,7 @@
#ifndef __DYNARRAY_H_
#define __DYNARRAY_H_
#if !defined(linux) && !defined(CSRG_BASED)
#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
#include <generic.h>
#endif
#if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)

View File

@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/1 1996/04/21 19:15:07 drk $
#include <Threads.tmpl>
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES =
INCLUDES = -I. -I../TermPrim

View File

@@ -10,6 +10,7 @@ XCOMM $TOG: Imakefile /main/3 1998/03/16 14:41:32 mgreess $
#include <Threads.tmpl>
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = $(ARCHITECTURE_DEFINES)
INCLUDES = -I.

View File

@@ -39,7 +39,7 @@ static char rcs_id[] = "$XConsortium: TermPrimDebug.c /main/4 1996/11/21 19:58:1
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
# include <stdarg.h>
#else
# include <varargs.h>

View File

@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/1 1996/04/21 19:20:11 drk $
#include <Threads.tmpl>
DEPEND_DEFINES = $(DEPENDDEFINES)
INCLUDES = -I. -I../TermPrim -I../Term
SRCS = \

View File

@@ -12,6 +12,7 @@ XCOMM $XConsortium: Imakefile /main/8 1996/04/21 19:11:16 drk $
#ifndef DtWidgetDefines
# define DtWidgetDefines -DI18N_MSG -DMULTIBYTE
#endif
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = DtWidgetDefines
#if defined(LinuxArchitecture)
INCLUDES = -I. -I/usr/include/freetype2

View File

@@ -24,9 +24,11 @@ REQUIREDLIBS = SharedCsaReqs
#endif
#ifdef SunArchitecture
EXTRA_DEFINES = -xstrconst -v -DSunOS=$(OSMAJORVERSION)$(OSMINORVERSION)
EXTRA_DEFINES = -v -DSunOS=$(OSMAJORVERSION)$(OSMINORVERSION)
#ifndef HasGcc2
SHLIBLDFLAGS = -G -z text -z defs
#endif
#endif
#ifdef HPArchitecture
EXTRA_DEFINES = -DHPUX

View File

@@ -1,7 +1,7 @@
XCOMM $XConsortium: Imakefile /main/14 1996/05/08 09:27:35 drk $
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include <Threads.tmpl>

View File

@@ -1,7 +1,7 @@
XCOMM $XConsortium: Imakefile /main/14 1996/05/08 09:28:02 drk $
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include <Threads.tmpl>

View File

@@ -1,7 +1,7 @@
XCOMM $XConsortium: Imakefile /main/15 1996/09/30 13:50:43 drk $
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include <Threads.tmpl>

View File

@@ -214,10 +214,10 @@ main(int argc, char** argv, char **envp)
void install_signal_handler();
SVCXPRT *transp;
struct sockaddr_in saddr;
#if defined(DEC) || defined(sun) || defined(HPUX)
#if defined(DEC) || defined(HPUX)
int asize = sizeof(struct sockaddr);
#else
# if defined(linux) || defined(CSRG_BASED)
# if defined(linux) || defined(CSRG_BASED) || defined(sun)
socklen_t asize;
# else
size_t asize = sizeof(struct sockaddr);

View File

@@ -1,7 +1,7 @@
XCOMM $XConsortium: Imakefile /main/15 1996/10/09 14:02:13 drk $
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include <Threads.tmpl>

View File

@@ -1,7 +1,7 @@
XCOMM $XConsortium: Imakefile /main/11 1996/05/08 09:28:48 drk $
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include <Threads.tmpl>

View File

@@ -1,7 +1,7 @@
XCOMM $XConsortium: Imakefile /main/14 1996/10/09 14:02:22 drk $
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
#include <Threads.tmpl>

View File

@@ -45,8 +45,10 @@ INCLUDES = -I.
#ifdef SharedTtReqs
#ifdef SunArchitecture
REQUIREDLIBS = SharedTtReqs -lC -lCrun
REQUIREDLIBS = SharedTtReqs
#ifndef HasGcc2
SHLIBLDFLAGS = -G
#endif
#else
REQUIREDLIBS = SharedTtReqs
#endif

View File

@@ -12,7 +12,7 @@ XCOMM $TOG: Imakefile /main/9 1999/08/30 10:50:55 mgreess $
#endif
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl>

View File

@@ -9,7 +9,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/04/21 19:12:19 drk $
#define LibCreate NO
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl>

View File

@@ -9,7 +9,7 @@ XCOMM $TOG: Imakefile /main/8 1999/08/30 10:52:07 mgreess $
#define LibCreate NO
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl>

View File

@@ -296,13 +296,8 @@
# 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_DLOPEN_X11
# undef OPT_DLOPEN_CE
# undef OPT_ADDMSG_DIRECT
# define OPT_SECURE_RPC
# undef OPT_CLASSING_ENGINE
@@ -322,8 +317,6 @@
# undef OPT_DEFINE_SIG_PF
# define OPT_TAR_HAS_EXCLUDE_OPTION
# define OPT_BUG_SUNOS_5
# define OPT_HAS_REALPATH
# undef OPT_AUTOMOUNT_PATH_FIX

View File

@@ -12,7 +12,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/05/07 19:13:02 drk $
#endif
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl>

View File

@@ -9,7 +9,7 @@ XCOMM $XConsortium: Imakefile /main/9 1996/08/29 16:11:24 barstow $
#define LibCreate NO
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl>

View File

@@ -229,6 +229,11 @@ load_xt_fns_from_handle(void *xt_handle)
if ( _tt_xt . fn == (_Tt_xfn_ptr)0) { \
return(0); \
}
#define DLINK_FNV(fn)\
_tt_xt . fn = (void*)(_Tt_xfn_ptr)dlsym(xt_handle, #fn); \
if ( _tt_xt . fn == (_Tt_xfn_ptr)0) { \
return(0); \
}
#else /* __STDC__ */
#define DLINK_FN(fn)\
_tt_xt . fn = (_Tt_xfn_ptr)dlsym(xt_handle, "fn"); \
@@ -250,7 +255,7 @@ load_xt_fns_from_handle(void *xt_handle)
DLINK_FN(XtAppAddTimeOut)
DLINK_FN(XtRemoveTimeOut)
DLINK_FN(XtAppProcessEvent)
DLINK_FN(applicationShellWidgetClass)
DLINK_FNV(applicationShellWidgetClass)
return(1);
}

View File

@@ -54,7 +54,7 @@
#endif
#include <stdlib.h>
#include <ctype.h>
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <wctype.h>
#endif
#include "util/tt_string.h"

View File

@@ -11,6 +11,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:12:37 drk $
#include "../tooltalk.tmpl"
DEPEND_DEFINES = $(DEPENDDEFINES)
INCLUDES = -I.
SRCS = isaddindex.c isamaddindex.c isopen.c isamopen.c \

View File

@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)iscntl.c 1.8 94/11/17";
* Generic control function
*/
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
#include <stdarg.h>
#else
#include <varargs.h>
@@ -79,7 +79,7 @@ static char sccsid[] = "@(#)iscntl.c 1.8 94/11/17";
typedef int (* intfunc)();
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
int
iscntl(int isfd, int func, ...)
#else
@@ -94,7 +94,7 @@ iscntl(isfd, func, va_alist)
va_list pvar;
int ret;
#if defined(linux) || defined(CSRG_BASED)
#if defined(linux) || defined(CSRG_BASED) || defined(sun)
va_start(pvar, func);
#else
va_start(pvar);

View File

@@ -8,7 +8,7 @@ XCOMM $TOG: Imakefile /main/7 1999/08/30 11:01:36 mgreess $
#define LibInstall NO
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
#include <Threads.tmpl>

View File

@@ -100,7 +100,7 @@ static gid_t req_auth_gids[NGROUPS_MAX];
#endif /* OPT_BUG_SUNOS_4 */
#if defined(OPT_BUG_SUNOS_5)
typedef (*Hack_getucred)(const struct authdes_cred *,
typedef void (*Hack_getucred)(const struct authdes_cred *,
uid_t *,
gid_t *,
short *,