8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:43:02 +01:00

Code cleanup of obsolete XENIX port and missed MAC (MAC_AUX) port items

This commit is contained in:
seanleyne 2002-02-16 02:50:01 +00:00
parent 6c6b32fb48
commit 1c799cfb3e
17 changed files with 152 additions and 179 deletions

View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
*
*/
@ -371,7 +372,6 @@ typedef UINT16 PDXResult;
#define ULTRIX_CP 7
#define AIX_CP 8
#define AUX_CP 9
#define XENIX_CP 10
/*
// SHIFT-JIS (JAPANESE DBCS)
@ -1021,9 +1021,12 @@ pVOID CALLTYPE LdCalloc(UINT16 NumberItems, UINT16 SizeItem);
// VCS AREA
//-----------------------------------------------------------------
// $Header: /home/job/firebird/cvs-backup/firebird2/src/intl/ld.h,v 1.2 2002-02-16 01:58:24 seanleyne Exp $
// $Header: /home/job/firebird/cvs-backup/firebird2/src/intl/ld.h,v 1.3 2002-02-16 02:49:56 seanleyne Exp $
// $Log: not supported by cvs2svn $
// Revision 1.2 2002/02/16 01:58:24 seanleyne
// Code cleanup of obsolete MAC AUX port defines "MAC" and "MAC_CP"
//
// Revision 1.1.1.1 2001/05/23 13:25:50 tamlin
// First steps towards a C++ conversion.
//

View File

@ -27,12 +27,12 @@
* readonly databases.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
*
*/
/*
$Id: common.h,v 1.8 2002-02-16 02:21:27 seanleyne Exp $
$Id: common.h,v 1.9 2002-02-16 02:49:56 seanleyne Exp $
*/
#ifndef JRD_COMMON_H
@ -646,7 +646,6 @@ typedef unsigned __int64 UINT64;
#ifdef M_I386
#define SMALL_FILE_NAMES
#define XENIX 1
#define NOHOSTNAME
#define KILLER_SIGNALS
#define SYSV_SIGNALS
@ -682,7 +681,6 @@ typedef unsigned __int64 UINT64;
#else /* ifndef SCO_EV */
#define XENIX 1
#define I386 1
#define VAX 1
#define UNIX 1

View File

@ -15,6 +15,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" port
*
*/
/*
* PROGRAM: C preprocessor
@ -567,7 +570,6 @@ const char gds_info_db_impl_isc_sun4 = 30;
const char gds_info_db_impl_isc_hp_ux = 31;
const char gds_info_db_impl_isc_sun_386i = 32;
const char gds_info_db_impl_isc_vms_orcl = 33;
const char gds_info_db_impl_isc_mac_aux = 34;
const char gds_info_db_impl_isc_rt_aix = 35;
const char gds_info_db_impl_isc_mips_ult = 36;
const char gds_info_db_impl_isc_apl_dn10 = 37;

View File

@ -21,6 +21,8 @@
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" (MAC_AUX) port
*
*/
@ -889,10 +891,8 @@ const char gds_info_forced_writes = 52;
#define gds__info_db_impl_isc_hp_ux 31
#define gds__info_db_impl_isc_sun_386i 32
#define gds__info_db_impl_isc_vms_orcl 33
#define gds__info_db_impl_isc_mac_aux 34
#define gds__info_db_impl_isc_rt_aix 35
#define gds__info_db_impl_isc_mips_ult 36
#define gds__info_db_impl_isc_xenix 37
#define gds__info_db_impl_isc_dg 38
#define gds__info_db_impl_isc_hp_mpexl 39
#define gds__info_db_impl_isc_hp_ux68K 40
@ -938,10 +938,8 @@ const char gds_info_db_impl_isc_sun4 = 30;
const char gds_info_db_impl_isc_hp_ux = 31;
const char gds_info_db_impl_isc_sun_386i = 32;
const char gds_info_db_impl_isc_vms_orcl = 33;
const char gds_info_db_impl_isc_mac_aux = 34;
const char gds_info_db_impl_isc_rt_aix = 35;
const char gds_info_db_impl_isc_mips_ult = 36;
const char gds_info_db_impl_isc_xenix = 37;
const char gds_info_db_impl_isc_dg = 38;
const char gds_info_db_impl_isc_hp_mpexl = 39;
const char gds_info_db_impl_isc_hp_ux68K = 40;

View File

@ -22,9 +22,11 @@
* FSG 16.03.2001
*/
/*
$Id: ibase.h,v 1.5 2002-02-16 02:21:27 seanleyne Exp $
$Id: ibase.h,v 1.6 2002-02-16 02:49:56 seanleyne Exp $
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" (MAC_AUX) port
*
*/
@ -1517,10 +1519,8 @@ ISC_STATUS ISC_EXPORT isc_suspend_window(ISC_STATUS ISC_FAR*,
#define isc_info_db_impl_isc_hp_ux 31
#define isc_info_db_impl_isc_sun_386i 32
#define isc_info_db_impl_isc_vms_orcl 33
#define isc_info_db_impl_isc_mac_aux 34
#define isc_info_db_impl_isc_rt_aix 35
#define isc_info_db_impl_isc_mips_ult 36
#define isc_info_db_impl_isc_xenix 37
#define isc_info_db_impl_isc_dg 38
#define isc_info_db_impl_isc_hp_mpexl 39
#define isc_info_db_impl_isc_hp_ux68K 40

View File

@ -21,6 +21,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
*
*/
#include "firebird.h"
@ -493,11 +496,6 @@ ISC_exit()
**************************************/
SIGVEC internal_sigfpe;
#ifdef XENIX
#define ISC_EXIT
sigset(SIGFPE, client_sigfpe);
#endif
#ifndef ISC_EXIT
sigvector(SIGFPE, &client_sigfpe, 0);
#endif

View File

@ -19,6 +19,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
*
*/
#if defined(_WIN32) || defined(WIN32) || defined(__WIN32__) || defined(WIN_NT)
@ -201,13 +204,6 @@ union semun {
#define SEMUN
#endif
#ifdef XENIX
/* 5.5 SCO Port: SIGURG - is now available in SCO Openserver */
#ifndef SCO_EV
#define SIGURG SIGUSR1
#endif
#endif
#ifndef SIGURG
#define SIGURG SIGINT
#endif

View File

@ -19,7 +19,7 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
* $Id: license.h,v 1.5 2002-02-16 02:21:27 seanleyne Exp $
* $Id: license.h,v 1.6 2002-02-16 02:49:56 seanleyne Exp $
* Revision 1.5 2000/12/08 16:18:21 fsg
* Preliminary changes to get IB_BUILD_NO automatically
* increased on commits.
@ -35,7 +35,8 @@
* now be done in 'builds_win32/original/build_no.ksh'.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" and "MAC_CP" defines
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
*
*/
@ -125,14 +126,6 @@
#define FB_PLATFORM "DL"
#endif
#ifdef XENIX
#ifdef SCO_UNIX
#define FB_PLATFORM "SI" /* 5.5 SCO Port */
#else
#define FB_PLATFORM "XN"
#endif
#endif
#ifdef sgi
#define FB_PLATFORM "SG"
#endif

View File

@ -99,7 +99,7 @@ static BOOLEAN find_type(SLONG, WIN *, PAG *, USHORT, USHORT, UCHAR **,
1 Apollo 68K, Dn 10K
2 Sun 68k, Sun Sparc, HP 9000/300, MAC AUX, IMP, DELTA, NeXT, UNIXWARE, DG_X86
3 Sun 386i, XENIX
3 Sun 386i
4 VMS
5 Ultrix/VAX
6 Ultrix/MIPS
@ -164,10 +164,6 @@ static BOOLEAN find_type(SLONG, WIN *, PAG *, USHORT, USHORT, UCHAR **,
#define CLASS 10
#endif
#ifdef XENIX
#define CLASS 3
#endif
#ifdef IMP
#define CLASS 2
#endif

View File

@ -20,7 +20,7 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup is required of obsolete "EPSON" port
* 2002.02.15 Sean Leyne - Code Cleanup is required of obsolete "EPSON", "XENIX" ports
*
*/

View File

@ -19,6 +19,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
*
*/
#include <stdio.h>
@ -67,10 +70,6 @@ union semun {
#define SEMAPHORES 10
#endif
#ifdef XENIX
#define SEMAPHORES 10
#endif
#ifdef M88K
#define SEMAPHORES 10
#endif

View File

@ -51,6 +51,10 @@ timestamp='2001-05-11'
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
#
# 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
#
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
@ -1013,7 +1017,7 @@ case $os in
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* \
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@ -1117,12 +1121,6 @@ case $os in
-es1800*)
os=-ose
;;
-xenix)
os=-xenix
;;
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
os=-mint
;;
-none)
;;
*)

View File

@ -19,6 +19,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
*
*/
#include "firebird.h"
@ -75,15 +78,13 @@ static int file;
#else
#include <sys/types.h>
#ifndef DELTA
#ifndef XENIX
#ifndef PC_PLATFORM
#ifndef WIN_NT
#include <sys/file.h>
#endif
#endif
#endif
#endif
#endif
#endif /* VMS */
#ifndef O_RDWR
#include <fcntl.h>

View File

@ -276,7 +276,6 @@ static STUFF stuff[] = {
ITEM(gds__info_db_impl_isc_hp_ux, INFO, VALUES)
ITEM(gds__info_db_impl_isc_sun_386i, INFO, VALUES)
ITEM(gds__info_db_impl_isc_vms_orcl, INFO, VALUES)
ITEM(gds__info_db_impl_isc_mac_aux, INFO, VALUES)
ITEM(gds__info_db_impl_isc_rt_aix, INFO, VALUES)
ITEM(gds__info_db_impl_isc_mips_ult, INFO, VALUES)
ITEM(gds__info_db_impl_isc_apl_dn10, INFO, VALUES)

View File

@ -22,11 +22,12 @@
* Added TCP_NO_DELAY option for superserver on Linux
* FSG 16.03.2001
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
*
*/
/*
$Id: inet.cpp,v 1.6 2002-02-16 02:21:28 seanleyne Exp $
$Id: inet.cpp,v 1.7 2002-02-16 02:49:56 seanleyne Exp $
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
@ -201,13 +202,6 @@ typedef int socklen_t;
#define EINTR 0
#endif
#ifdef XENIX
/* 5.5 SCO Port: SIGURG is now available in SCO Openserver */
#ifndef SCO_EV
#define SIGURG SIGUSR1
#endif
#endif
#ifndef hpux
#define sigvector sigvec
#endif
@ -2494,7 +2488,7 @@ static int parse_line(
if (strcmp(entry1, host_name))
#ifdef UNIX
#if !(defined XENIX || defined UNIXWARE || defined NCR3000)
#if !(defined UNIXWARE || defined NCR3000)
if (entry1[1] == '@') {
if (!innetgr(&entry1[2], host_name, 0, 0))
return -1;
@ -2523,7 +2517,7 @@ static int parse_line(
/* if they're in the user group: + they're in, - they're out */
#ifdef UNIX
#if !(defined XENIX || defined UNIXWARE || defined NCR3000)
#if !(defined UNIXWARE || defined NCR3000)
if (entry2[1] == '@') {
if (innetgr(&entry2[2], 0, user_name, 0)) {
if (entry2[0] == '+')

View File

@ -22,11 +22,12 @@
* Added TCP_NO_DELAY option for superserver on Linux
* FSG 16.03.2001
*
* 2002.02.15 Sean Leyne - This module needs to be cleanedup to remove obsolete "EPSON" port/define
* 2002.02.15 Sean Leyne - This module needs to be cleanedup to remove obsolete ports/defines:
* - "EPSON", "XENIX"
*
*/
/*
$Id: protocol.h,v 1.4 2002-02-16 02:21:28 seanleyne Exp $
$Id: protocol.h,v 1.5 2002-02-16 02:49:56 seanleyne Exp $
*/
#ifndef _REMOTE_PROTOCOL_H_
#define _REMOTE_PROTOCOL_H_

View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
*
*/
@ -103,10 +104,6 @@
#endif /* DG_X86 */
#endif /* DGUX */
#ifdef XENIX
#define ARCHITECTURE arch_sco
#endif
#ifdef SCO_EV
#define ARCHITECTURE arch_sco_ev
#endif