mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 20:43:02 +01:00
Code cleanup of obsolete NCR3000 port
This commit is contained in:
seanleyne
parent
0d3a85d098
commit
68e1650068
@ -3,6 +3,7 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*/
|
||||
|
||||
#ifndef AUTOCONFIG_H
|
||||
@ -80,6 +81,5 @@
|
||||
#undef _CRAY
|
||||
#undef M88K
|
||||
#undef UNIXWARE
|
||||
#undef NCR3000
|
||||
|
||||
#endif
|
||||
@ -31,10 +31,11 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*
|
||||
*/
|
||||
/*
|
||||
$Id: common.h,v 1.11 2002-02-16 03:27:32 seanleyne Exp $
|
||||
$Id: common.h,v 1.12 2002-02-16 03:33:52 seanleyne Exp $
|
||||
*/
|
||||
|
||||
#ifndef JRD_COMMON_H
|
||||
@ -922,40 +923,6 @@ typedef unsigned long DWORD;
|
||||
#endif /* UNIXWARE */
|
||||
|
||||
|
||||
|
||||
#ifdef NCR3000
|
||||
#define INTL
|
||||
#define SETPGRP setpgrp()
|
||||
#define KILLER_SIGNALS
|
||||
#define SIGACTION_SUPPORTED
|
||||
#define MMAP_SUPPORTED
|
||||
#define NO_FLOCK
|
||||
#define NO_PYXIS
|
||||
#define I386 1
|
||||
#define VAX 1
|
||||
#define UNIX 1
|
||||
#define CURSES_KEYPAD 1
|
||||
#define IMPLEMENTATION 56
|
||||
#define IEEE
|
||||
#define ATEXIT(c) atexit (c)
|
||||
|
||||
#ifndef MAXPATHLEN
|
||||
#define MAXPATHLEN 1024
|
||||
#endif
|
||||
|
||||
#define MEMMOVE(from,to,length) memmove ((void *)to, (void *)from, (size_t) length)
|
||||
#define MOVE_FAST(from,to,length) memcpy (to, from, (int) (length))
|
||||
#define MOVE_FASTER(from,to,length) memcpy (to, from, (int) (length))
|
||||
#define MOVE_CLEAR(to,length) memset (to, 0, (int) (length))
|
||||
#define setreuid(ruid,euid) setuid (euid)
|
||||
#define setregid(rgid,egid) setgid (egid)
|
||||
|
||||
#define SYSCALL_INTERRUPTED(err) (((err) == EINTR) || ((err) == ERESTART))
|
||||
|
||||
#endif /* NCR3000 */
|
||||
|
||||
|
||||
|
||||
#ifdef UNIX
|
||||
#define NO_CHECKSUM 1
|
||||
#define SYS_ARG isc_arg_unix
|
||||
|
||||
@ -24,10 +24,11 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*
|
||||
*/
|
||||
|
||||
/* $Id: isc_ipc.cpp,v 1.9 2002-02-16 03:27:32 seanleyne Exp $ */
|
||||
/* $Id: isc_ipc.cpp,v 1.10 2002-02-16 03:33:53 seanleyne Exp $ */
|
||||
|
||||
#ifdef SHLIB_DEFS
|
||||
#define LOCAL_SHLIB_DEFS
|
||||
@ -98,19 +99,20 @@ typedef void (*CLIB_ROUTINE SIG_FPTR) ();
|
||||
#ifdef DGUX
|
||||
#define GT_32_SIGNALS
|
||||
#endif
|
||||
|
||||
#if (defined AIX || defined AIX_PPC)
|
||||
#define GT_32_SIGNALS
|
||||
#endif
|
||||
|
||||
#ifdef M88K
|
||||
#define GT_32_SIGNALS
|
||||
#define HANDLER_ADDR_ARG
|
||||
#endif
|
||||
|
||||
#ifdef UNIXWARE
|
||||
#define HANDLER_ADDR_ARG
|
||||
#endif
|
||||
#ifdef NCR3000
|
||||
#define HANDLER_ADDR_ARG
|
||||
#endif
|
||||
|
||||
#ifdef SCO_EV
|
||||
#define HANDLER_ADDR_ARG
|
||||
#endif
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
*
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
* $Id: license.h,v 1.8 2002-02-16 03:27:32 seanleyne Exp $
|
||||
* $Id: license.h,v 1.9 2002-02-16 03:33:53 seanleyne Exp $
|
||||
* Revision 1.5 2000/12/08 16:18:21 fsg
|
||||
* Preliminary changes to get IB_BUILD_NO automatically
|
||||
* increased on commits.
|
||||
@ -34,11 +34,12 @@
|
||||
* So all changes to version numbers, build types etc. can
|
||||
* 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 "MAC" port
|
||||
* 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 "DELTA" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -173,10 +174,6 @@
|
||||
#define FB_PLATFORM "UW" /* Unixware */
|
||||
#endif
|
||||
|
||||
#ifdef NCR3000
|
||||
#define FB_PLATFORM "NC" /* NCR3000 */
|
||||
#endif
|
||||
|
||||
#ifdef LINUX
|
||||
#define FB_PLATFORM "LI" /* Linux on Intel */
|
||||
#endif
|
||||
|
||||
@ -23,6 +23,7 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -174,10 +175,6 @@ static BOOLEAN find_type(SLONG, WIN *, PAG *, USHORT, USHORT, UCHAR **,
|
||||
#define CLASS 2
|
||||
#endif
|
||||
|
||||
#ifdef NCR3000
|
||||
#define CLASS 2
|
||||
#endif
|
||||
|
||||
#ifdef DGUX
|
||||
#ifdef DG_X86
|
||||
#define CLASS 2
|
||||
|
||||
@ -23,6 +23,7 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -94,10 +95,6 @@
|
||||
#define SEMAPHORES 10
|
||||
#endif
|
||||
|
||||
#ifdef NCR3000
|
||||
#define SEMAPHORES 25
|
||||
#endif
|
||||
|
||||
#ifdef SCO_UNIX
|
||||
#define SEMAPHORES 25
|
||||
#endif
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*/
|
||||
|
||||
#ifndef AUTOCONFIG_H
|
||||
@ -71,6 +72,5 @@
|
||||
#undef _CRAY
|
||||
#undef M88K
|
||||
#undef UNIXWARE
|
||||
#undef NCR3000
|
||||
|
||||
#endif
|
||||
@ -3,6 +3,7 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*/
|
||||
|
||||
#ifndef AUTOCONFIG_H
|
||||
@ -61,6 +62,5 @@
|
||||
#undef _CRAY
|
||||
#undef M88K
|
||||
#undef UNIXWARE
|
||||
#undef NCR3000
|
||||
|
||||
#endif
|
||||
@ -25,10 +25,11 @@
|
||||
* 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 "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*
|
||||
*/
|
||||
/*
|
||||
$Id: inet.cpp,v 1.8 2002-02-16 03:27:32 seanleyne Exp $
|
||||
$Id: inet.cpp,v 1.9 2002-02-16 03:33:53 seanleyne Exp $
|
||||
*/
|
||||
#include "firebird.h"
|
||||
#include "../jrd/ib_stdio.h"
|
||||
@ -126,10 +127,6 @@ extern int h_errno;
|
||||
#include <sys/sockio.h>
|
||||
#endif
|
||||
|
||||
#ifdef NCR3000
|
||||
#include <sys/filio.h>
|
||||
#endif
|
||||
|
||||
#ifdef NETWARE_386
|
||||
#define NO_ITIMER
|
||||
#define NO_FORK
|
||||
@ -3341,34 +3338,6 @@ static void inet_handler( PORT port)
|
||||
|
||||
if ((n = recv((SOCKET) port->port_handle, &junk, 1, MSG_OOB)) < 0) {
|
||||
|
||||
#ifdef NCR3000
|
||||
/* this is all being added for ncr's pecular behaviour with
|
||||
SIGURG. As if we get a sigurg and a receive with OOB fails
|
||||
we need to do a regular recv call to enable SIGURG
|
||||
signals on further OOB data. */
|
||||
if (errno == EWOULDBLOCK) {
|
||||
/* set the flag to non blocking and attempt a normal recv */
|
||||
char arg = 1;
|
||||
int n_recv;
|
||||
|
||||
if (ioctl(port->port_handle, FIONBIO, &arg) < 0) {
|
||||
/* donot want to peek if we cannot set the socket to
|
||||
non blocking as then recv() with PEEK waits till
|
||||
data arrives, and we donot want ot block in a
|
||||
signal handler that long. In fact we always expect
|
||||
recv to fail. */
|
||||
|
||||
return;
|
||||
}
|
||||
/* attempt normal receive this is done inorder to make sigurg
|
||||
work correctly on the ncr system. */
|
||||
n_recv = recv(port->port_handle, &junk, 1, MSG_PEEK);
|
||||
/* set socket to blocking again */
|
||||
arg = 0;
|
||||
ioctl(port->port_handle, FIONBIO, &arg);
|
||||
}
|
||||
#endif
|
||||
|
||||
return;
|
||||
}
|
||||
(*((void(*)(PORT))port->port_ast)) (port);
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "XENIX" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
|
||||
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
|
||||
*
|
||||
*/
|
||||
|
||||
@ -70,10 +71,6 @@
|
||||
#define ARCHITECTURE arch_unixware
|
||||
#endif
|
||||
|
||||
#ifdef NCR3000
|
||||
#define ARCHITECTURE arch_ncr3000
|
||||
#endif
|
||||
|
||||
#ifdef NETWARE_386
|
||||
#define ARCHITECTURE arch_msdos
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user