firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 23:23:02 +01:00
Code Issues

More code cleanup of old NCR3000 and M88K ports

Browse Source
This commit is contained in:
seanleyne 2002-02-23 22:15:24 +00:00
parent 42383bd6ba
commit df41820266
7 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jrd/flu.cpp
View File

@ -22,9 +22,12 @@
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*
* 2002-02-23 Sean Leyne - Code Cleanup, removed old M88K and NCR3000 port
*
*/
/*
$Id: flu.cpp,v 1.6 2002-02-16 02:21:27 seanleyne Exp $
$Id: flu.cpp,v 1.7 2002-02-23 22:15:23 seanleyne Exp $
*/
#include "firebird.h"
@ -79,9 +82,9 @@ static int condition_handler(int *, int *, int *);
#endif
/* SGI, UNIXWARE, M88K, DECOSF specific stuff */
/* SGI, UNIXWARE, DECOSF specific stuff */
#if (defined SOLARIS || defined sgi || defined M88K || defined UNIXWARE || defined NCR3000 || defined DECOSF || defined SCO_EV || defined linux || defined AIX_PPC)
#if (defined SOLARIS || defined sgi || defined UNIXWARE || defined DECOSF || defined SCO_EV || defined linux || defined AIX_PPC)
#include <dlfcn.h>
#define DYNAMIC_SHARED_LIBRARIES
#include <unistd.h>

7
src/jrd/isc_file.cpp
View File

@ -23,6 +23,9 @@
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
*
* 2002-02-23 Sean Leyne - Code Cleanup, removed old M88K and NCR3000 port
*
*
*/
#ifdef SHLIB_DEFS
@ -97,7 +100,7 @@ typedef struct itm {
#define MTAB "/etc/mnttab"
#endif
#if (defined SOLARIS || defined M88K || defined UNIXWARE || defined NCR3000)
#if (defined SOLARIS || defined UNIXWARE)
#define SV_MNTENT
#define NON_MNTENT
#include <sys/mnttab.h>
@ -137,7 +140,7 @@ typedef struct itm {
#include <sys/vmount.h>
#endif
#if (defined SOLARIS || defined UNIXWARE || defined NCR3000 || defined linux || defined M88K || defined FREEBSD || defined NETBSD || defined DARWIN)
#if (defined SOLARIS || defined UNIXWARE || defined linux || defined FREEBSD || defined NETBSD || defined DARWIN)
#define GETWD(buf) getcwd (buf, MAXPATHLEN)
#endif

7
src/jrd/isc_sync.cpp
View File

@ -24,6 +24,9 @@
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*
* 2002-02-23 Sean Leyne - Code Cleanup, removed old M88K and NCR3000 port
*
*/
#if defined(_WIN32) || defined(WIN32) || defined(__WIN32__) || defined(WIN_NT)
@ -3295,7 +3298,7 @@ UCHAR *ISC_map_object(STATUS * status_vector,
/* Get system page size as this is the unit of mapping. */
#if (defined SOLARIS || defined NCR3000)
#ifdef SOLARIS
if ((page_size = sysconf(_SC_PAGESIZE)) == -1) {
error(status_vector, "sysconf", errno);
return NULL;
@ -3353,7 +3356,7 @@ BOOLEAN ISC_unmap_object(STATUS * status_vector,
/* Get system page size as this is the unit of mapping. */
#if (defined SOLARIS || defined NCR3000)
#ifdef SOLARIS
if ((page_size = sysconf(_SC_PAGESIZE)) == -1) {
error(status_vector, "sysconf", errno);
return NULL;

7
src/jrd/why.c
View File

@ -25,9 +25,12 @@
*
* 2002-02-23 Sean Leyne - Code Cleanup, removed old Win3.1 port (Windows_Only)
*
*
* 2002-02-23 Sean Leyne - Code Cleanup, removed old M88K and NCR3000 port
*
*/
/*
$Id: why.c,v 1.6 2002-02-23 22:08:37 seanleyne Exp $
$Id: why.c,v 1.7 2002-02-23 22:15:23 seanleyne Exp $
*/
#include "firebird.h"
@ -497,7 +500,7 @@ static CONST_IMAGE IMAGE images[] =
#endif
#if (defined UNIX) && \
!(defined SUPERCLIENT || defined SUPERSERVER || defined DECOSF || defined NCR3000 || defined DG_X86 || defined linux || defined FREEBSD || defined NETBSD || defined AIX_PPC || defined DARWIN /* platforms without a V3 bridge */)
!(defined SUPERCLIENT || defined SUPERSERVER || defined DECOSF || defined DG_X86 || defined linux || defined FREEBSD || defined NETBSD || defined AIX_PPC || defined DARWIN /* platforms without a V3 bridge */)
#ifndef PIPE_SERVER_YVALUE
#define PIPE_BRIDGE_TO_V3
#endif

7
src/jrd/y-valve.cpp
View File

@ -22,9 +22,12 @@
*
* 2002-02-23 Sean Leyne - Code Cleanup, removed old Win3.1 port (Windows_Only)
*
*
* 2002-02-23 Sean Leyne - Code Cleanup, removed old M88K and NCR3000 port
*
*/
/*
$Id: y-valve.cpp,v 1.2 2002-02-23 22:08:37 seanleyne Exp $
$Id: y-valve.cpp,v 1.3 2002-02-23 22:15:23 seanleyne Exp $
*/
#include "firebird.h"
@ -494,7 +497,7 @@ static CONST_IMAGE IMAGE images[] =
#endif
#if (defined UNIX) && \
!(defined SUPERCLIENT || defined SUPERSERVER || defined DECOSF || defined NCR3000 || defined DG_X86 || defined linux || defined FREEBSD || defined NETBSD || defined AIX_PPC || defined DARWIN /* platforms without a V3 bridge */)
!(defined SUPERCLIENT || defined SUPERSERVER || defined DECOSF || defined DG_X86 || defined linux || defined FREEBSD || defined NETBSD || defined AIX_PPC || defined DARWIN /* platforms without a V3 bridge */)
#ifndef PIPE_SERVER_YVALUE
#define PIPE_BRIDGE_TO_V3
#endif

7
src/pipe/head.cpp
View File

@ -23,9 +23,12 @@
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "EPSON" define
*
*
* 2002-02-23 Sean Leyne - Code Cleanup, removed old M88K and NCR3000 port
*
*/
/* $Id: head.cpp,v 1.5 2002-02-16 02:21:28 seanleyne Exp $ */
/* $Id: head.cpp,v 1.6 2002-02-23 22:15:23 seanleyne Exp $ */
#include "firebird.h"
#include "../jrd/ib_stdio.h"
@ -71,7 +74,7 @@
#include <fcntl.h>
#endif
#if (defined UNIXWARE || defined NCR3000)
#ifdef UNIXWARE
#include <sys/fcntl.h>
#endif

10
src/remote/inet.cpp
View File

@ -27,9 +27,11 @@
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "NCR3000" port
*
* 2002-02-23 Sean Leyne - Code Cleanup, removed old M88K and NCR3000 port
*
*/
/*
$Id: inet.cpp,v 1.9 2002-02-16 03:33:53 seanleyne Exp $
$Id: inet.cpp,v 1.10 2002-02-23 22:15:24 seanleyne Exp $
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
@ -123,7 +125,7 @@ NETDB_DEFINE_CONTEXT
extern int h_errno;
#endif
#if (defined UNIXWARE || defined NCR3000 || defined M88K)
#ifdef UNIXWARE
#include <sys/sockio.h>
#endif
@ -2480,7 +2482,7 @@ static int parse_line(
if (strcmp(entry1, host_name))
#ifdef UNIX
#if !(defined UNIXWARE || defined NCR3000)
#ifndef UNIXWARE
if (entry1[1] == '@') {
if (!innetgr(&entry1[2], host_name, 0, 0))
return -1;
@ -2509,7 +2511,7 @@ static int parse_line(
/* if they're in the user group: + they're in, - they're out */
#ifdef UNIX
#if !(defined UNIXWARE || defined NCR3000)
#ifndef UNIXWARE
if (entry2[1] == '@') {
if (innetgr(&entry2[2], 0, user_name, 0)) {
if (entry2[0] == '+')