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

32
cde/programs/dtappbuilder/src/libAButil/util.c
View File

@@ -223,7 +223,7 @@ util_vfork()
#ifdef __cplusplus
extern "C" {
#endif
#if defined(__uxp__) || defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 )
#if defined(__hpux) || (defined(sun) && OSMAJORVERSION >= 5 && OSMINORVERSION >= 4 && OSMINORVERSION <=10 )
extern int putenv(const char *string);
#elif !(defined(__osf__) || defined(__aix) || defined(__NetBSD__))
extern int putenv(char *string);
@@ -251,7 +251,6 @@ util_get_os_type(void)
int hpIndex = -1;
int sunIndex = -1;
int unixwareIndex = -1;
int uxpIndex = -1;
int osf1Index = -1;
int lnxIndex = -1;
int fbsdIndex = -1;
@@ -271,7 +270,6 @@ util_get_os_type(void)
hpIndex = util_strcasestr(sysInfo.sysname, "hp");
sunIndex = util_strcasestr(sysInfo.sysname, "sun");
unixwareIndex = util_strcasestr(sysInfo.sysname, "UNIX_SV");
uxpIndex = util_strcasestr(sysInfo.sysname, "UNIX_System_V");
osf1Index = util_strcasestr(sysInfo.sysname, "osf1");
lnxIndex = util_strcasestr(sysInfo.sysname, "linux");
fbsdIndex = util_strcasestr(sysInfo.sysname, "freebsd");
@@ -282,64 +280,58 @@ util_get_os_type(void)
if (hpIndex < 0) hpIndex = INT_MAX;
if (sunIndex < 0) sunIndex = INT_MAX;
if (unixwareIndex < 0) unixwareIndex = INT_MAX;
if (uxpIndex < 0) uxpIndex = INT_MAX;
if (osf1Index < 0) osf1Index = INT_MAX;
if (lnxIndex < 0) lnxIndex = INT_MAX;
if (fbsdIndex < 0) fbsdIndex = INT_MAX;
if (nbsdIndex < 0) nbsdIndex = INT_MAX;
if (obsdIndex < 0) obsdIndex = INT_MAX;
#define IS_MATCH(a,b,c,d,e,f,g,h,i,j) \
#define IS_MATCH(a,b,c,d,e,f,g,h,i) \
(((a) < (b)) && ((a) < (c)) && ((a) < (d)) && ((a) < (e)) && ((a) < (f)) && \
((a) < (g)) && ((a) < (h)) && ((a) < (i)) && ((a) < (j)))
((a) < (g)) && ((a) < (h)) && ((a) < (i)))
if (IS_MATCH(aixIndex, hpIndex, sunIndex, osf1Index, unixwareIndex,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_AIX;
}
if (IS_MATCH(hpIndex, aixIndex, sunIndex, osf1Index, unixwareIndex,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_HPUX;
}
if (IS_MATCH(sunIndex, aixIndex, hpIndex, osf1Index, unixwareIndex,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_SUNOS;
}
if (IS_MATCH(osf1Index, aixIndex, hpIndex, sunIndex, unixwareIndex,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_OSF1;
}
if (IS_MATCH(uxpIndex, aixIndex, hpIndex, sunIndex, unixwareIndex,
osf1Index, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_UXP;
}
if (IS_MATCH(unixwareIndex, aixIndex, hpIndex, sunIndex, osf1Index,
uxpIndex, lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
lnxIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_UNIXWARE;
}
if (IS_MATCH(lnxIndex, aixIndex, hpIndex, sunIndex, osf1Index,
unixwareIndex, uxpIndex, fbsdIndex, nbsdIndex, obsdIndex))
unixwareIndex, fbsdIndex, nbsdIndex, obsdIndex))
{
return AB_OS_LNX;
}
if (IS_MATCH(fbsdIndex, aixIndex, hpIndex, sunIndex, osf1Index,
unixwareIndex, uxpIndex, lnxIndex, nbsdIndex, obsdIndex))
unixwareIndex, lnxIndex, nbsdIndex, obsdIndex))
{
return AB_OS_FBSD;
}
if (IS_MATCH(nbsdIndex, aixIndex, hpIndex, sunIndex, osf1Index,
unixwareIndex, uxpIndex, lnxIndex, fbsdIndex, obsdIndex))
unixwareIndex, lnxIndex, fbsdIndex, obsdIndex))
{
return AB_OS_NBSD;
}
if (IS_MATCH(obsdIndex, aixIndex, hpIndex, sunIndex, osf1Index,
unixwareIndex, uxpIndex, lnxIndex, fbsdIndex, nbsdIndex))
unixwareIndex, lnxIndex, fbsdIndex, nbsdIndex))
{
return AB_OS_OBSD;
}

1
cde/programs/dtappbuilder/src/libAButil/util.h
View File

@@ -83,7 +83,6 @@ typedef enum
AB_OS_SUNOS,
AB_OS_OSF1,
AB_OS_UNIXWARE,
AB_OS_UXP,
AB_OS_LNX,
AB_OS_FBSD,
AB_OS_NBSD,

2
cde/programs/dtappbuilder/src/libAButil/util_convert.c
View File

@@ -855,7 +855,6 @@ util_os_type_to_ident(AB_OS_TYPE osType)
case AB_OS_HPUX: typeString = "hpux"; break;
case AB_OS_SUNOS: typeString = "sunos"; break;
case AB_OS_UNIXWARE: typeString = "unixware"; break;
case AB_OS_UXP: typeString = "uxp"; break;
case AB_OS_OSF1: typeString = "osf1"; break;
case AB_OS_LNX: typeString = "linux"; break;
case AB_OS_FBSD: typeString = "freebsd"; break;
@@ -881,7 +880,6 @@ util_os_type_to_string(AB_OS_TYPE osType)
case AB_OS_HPUX: nameString = "HP-UX"; break;
case AB_OS_SUNOS: nameString = "SunOS"; break;
case AB_OS_UNIXWARE: nameString = "UnixWare"; break;
case AB_OS_UXP: nameString = "UXP"; break;
case AB_OS_OSF1: nameString = "OSF/1"; break;
case AB_OS_LNX: nameString = "Linux"; break;
case AB_OS_FBSD: nameString = "FreeBSD"; break;