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

Code cleanup of obsolete IMP port

Browse Source
This commit is contained in:
seanleyne 2002-02-16 03:27:33 +00:00
parent 45c6a79f70
commit 525f3aaaef
30 changed files with 251 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gpre/gpre.h
View File

@ -19,7 +19,7 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
* $Id: gpre.h,v 1.3 2002-01-04 11:34:15 skywalker Exp $
* $Id: gpre.h,v 1.4 2002-02-16 03:27:31 seanleyne Exp $
* Revision 1.3 2000/11/27 09:26:13 fsg
* Fixed bugs in gpre to handle PYXIS forms
* and allow edit.e and fred.e to go through
@ -42,6 +42,8 @@
* in WHERE clauses for sql dialect 2 and 3.
* (cause a core dump in a test case from C.R. Zamana)
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#ifndef _GPRE_GPRE_H_
@ -1565,20 +1567,10 @@ extern "C" {
#endif
#endif
/* IMP does'nt allow enums to be used in conditional operations that include
>, >= , <, <= etc. It only allows == for enums, hence the typecast */
#ifdef IMP
#define assert_IS_REQ(x) assert(!(x) || ((int)((x)->req_type) >= (int)0 && (int)((x)->req_type) < (int)REQ_LASTREQUEST))
#define assert_IS_SYM(x) assert(!(x) || ((int)((x)->sym_type) >= (int)0 && (int)((x)->sym_type) < (int)SYM_LASTSYM))
#define assert_IS_NOD(x) assert(!(x) || ((int)((x)->nod_type) >= (int)1 && (int)((x)->nod_type) < (int)nod_LASTNOD))
#define assert_IS_ACT(x) assert(!(x) || ((int)((x)->act_type) >= (int)0 && (int)((x)->act_type) < (int)ACT_LASTACT))
#else
#define assert_IS_REQ(x) assert(!(x) || ((x)->req_type >= 0 && (x)->req_type < REQ_LASTREQUEST))
#define assert_IS_SYM(x) assert(!(x) || ((x)->sym_type >= 0 && (x)->sym_type < SYM_LASTSYM))
#define assert_IS_NOD(x) assert(!(x) || ((x)->nod_type >= 1 && (x)->nod_type < nod_LASTNOD))
#define assert_IS_ACT(x) assert(!(x) || ((x)->act_type >= 0 && (x)->act_type < ACT_LASTACT))
#endif /** IMP **/
#ifdef __cplusplus
} /* extern "C" */

6
src/include/gen/autoconfig_msvc.h
View File

@ -1,7 +1,8 @@
/*
* 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 "DELTA" define
* 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
*/
#ifndef AUTOCONFIG_H
@ -80,6 +81,5 @@
#undef M88K
#undef UNIXWARE
#undef NCR3000
#undef IMP
#endif

4
src/intl/langdrv.h
View File

@ -17,6 +17,7 @@
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" define
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#ifndef _INTL_LANGDRV_H_
@ -54,9 +55,6 @@
#ifdef NXT
#define NON_DLINK_OS
#endif
#ifdef IMP
#define NON_DLINK_OS
#endif
#ifndef SGI
#ifdef mips
#define NON_DLINK_OS

25
src/jrd/common.h
View File

@ -30,10 +30,11 @@
* 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 "DELTA" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
/*
$Id: common.h,v 1.10 2002-02-16 03:05:17 seanleyne Exp $
$Id: common.h,v 1.11 2002-02-16 03:27:32 seanleyne Exp $
*/
#ifndef JRD_COMMON_H
@ -955,28 +956,6 @@ typedef unsigned long DWORD;
#ifdef IMP
#define NO_PYXIS
#define SETPGRP setpgrp()
#define KILLER_SIGNALS
#define SYSV_SIGNALS
#define SYSV_SHMEM
#define SMALL_FILE_NAMES
#define vfork fork
#define UNIX 1
#define CURSES_KEYPAD 1
#define FB_ALIGN(n,b) ((n+1) & ~1)
#define ALIGNMENT 4
#define DOUBLE_ALIGN 4
#define IMPLEMENTATION 44
#define IEEE
#define SHMEM_PICKY
#undef LINKS_EXIST
#define INTL
#define INTL_BACKEND
#endif
#ifdef UNIX
#define NO_CHECKSUM 1
#define SYS_ARG isc_arg_unix

5
src/jrd/cvt.cpp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
@ -71,10 +72,6 @@
#define DBL_MAX_10_EXP 308
#endif
#ifdef IMP
#define DBL_MAX_10_EXP 308
#endif
#ifdef SCO_UNIX
#define DBL_MAX_10_EXP 308
#endif

9
src/jrd/gds.cpp
View File

@ -19,6 +19,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#define IO_RETRY 20
@ -196,12 +199,6 @@ static CONST SCHAR *FAR_VARIABLE CONST messages[] = {
0 /* Null entry to terminate list */
};
#ifdef IMP
typedef unsigned int mode_t;
typedef int pid_t;
#endif
#ifdef M88K
#define GETTIMEOFDAY(time,tz) gettimeofday (time)
#endif

7
src/jrd/isc.cpp
View File

@ -24,7 +24,7 @@
* Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
*/
/*
$Id: isc.cpp,v 1.7 2002-02-16 03:05:17 seanleyne Exp $
$Id: isc.cpp,v 1.8 2002-02-16 03:27:32 seanleyne Exp $
*/
#ifdef DARWIN
#define _STLP_CCTYPE
@ -153,11 +153,6 @@ static LKSB wake_lock;
#include <fcntl.h>
#endif
#ifdef IMP
typedef unsigned int mode_t;
typedef int pid_t;
#endif
#ifdef DARWIN
#include </usr/include/pwd.h>
#else

11
src/jrd/isc_ipc.cpp
View File

@ -21,12 +21,13 @@
* Contributor(s): ______________________________________.
* Solaris x86 changes - Konstantin Kuznetsov, Neil McCalden
*
* 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 "DELTA" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
/* $Id: isc_ipc.cpp,v 1.8 2002-02-16 03:05:17 seanleyne Exp $ */
/* $Id: isc_ipc.cpp,v 1.9 2002-02-16 03:27:32 seanleyne Exp $ */
#ifdef SHLIB_DEFS
#define LOCAL_SHLIB_DEFS
@ -166,12 +167,6 @@ static int process_id = 0;
#define LOCAL_SEMAPHORES 4
#ifdef IMP
typedef int pid_t;
#define SHMEM_DELTA (1 << 25)
#endif
#ifdef SYSV_SIGNALS
#define SIGVEC FPTR_INT
#endif

39
src/jrd/isc_sync.cpp
View File

@ -22,6 +22,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
*
*/
@ -145,13 +146,6 @@ static UCHAR *next_shared_memory;
#define PRIV 0666
#define LOCAL_SEMAPHORES 4
#ifdef IMP
typedef unsigned int mode_t;
typedef int pid_t;
#define SHMEM_DELTA (1 << 25)
#endif
#ifdef SYSV_SIGNALS
#define SIGVEC FPTR_INT
#endif
@ -324,15 +318,9 @@ static void make_object_name(TEXT *, TEXT *, TEXT *);
#define sbrk (*_libgds_sbrk)
#define setitimer (*_libgds_setitimer)
#define alarm (*_libgds_alarm)
#ifndef IMP
#define sigprocmask (*_libgds_sigprocmask)
#define sigsuspend (*_libgds_sigsuspend)
#define sigaddset (*_libgds_sigaddset)
#else
#define sigsetmask (*_libgds_sigsetmask)
#define sigpause (*_libgds_sigpause)
#define sigblock (*_libgds_sigblock)
#endif
extern int sprintf();
extern int strlen();
@ -362,15 +350,9 @@ extern SCHAR *sbrk();
extern int setitimer();
extern int alarm();
extern SCHAR *shmat();
#ifndef IMP
extern int sigprocmask();
extern int sigsuspend();
extern int sigaddset();
#else
extern int sigsetmask();
extern int sigpause();
extern int sigblock();
#endif
#endif
@ -1134,34 +1116,19 @@ int ISC_event_wait(
if ((*events)->event_semid == -1) {
++inhibit_restart;
#ifdef IMP
oldmask =
sigblock(sigmask(SIGUSR1) | sigmask(SIGUSR2) | sigmask(SIGURG));
#else
sigprocmask(SIG_BLOCK, NULL, &oldmask);
mask = oldmask;
sigaddset(&mask, SIGUSR1);
sigaddset(&mask, SIGUSR2);
sigaddset(&mask, SIGURG);
sigprocmask(SIG_BLOCK, &mask, NULL);
#endif
for (;;) {
if (!ISC_event_blocked(count, events, values)) {
--inhibit_restart;
#ifdef IMP
sigsetmask(oldmask);
#else
sigprocmask(SIG_SETMASK, &oldmask, NULL);
#endif
return SUCCESS;
}
#ifdef IMP
mask = sigsetmask(oldmask);
sigpause(0);
oldmask = sigsetmask(mask);
#else
sigsuspend(&oldmask);
#endif
}
}
@ -2818,11 +2785,7 @@ UCHAR *ISC_map_file(STATUS * status_vector,
#ifndef SYSV_SHMEM
next_shared_memory = address + length;
#else
#ifndef IMP
next_shared_memory = address + length + SHMLBA;
#else
next_shared_memory = address + length + 0x100000;
#endif
#endif
#else
address = (UCHAR *) shmat(shmid, NULL, 0);

7
src/jrd/jrn.cpp
View File

@ -19,6 +19,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#ifdef SHLIB_DEFS
@ -119,11 +122,7 @@ extern int send();
extern int socket();
extern int recv();
extern uint sleep();
#ifndef IMP
extern void *memcpy();
#else
extern SCHAR *memcpy();
#endif
#endif

7
src/jrd/license.h
View File

@ -19,7 +19,7 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
* $Id: license.h,v 1.7 2002-02-16 03:05:17 seanleyne Exp $
* $Id: license.h,v 1.8 2002-02-16 03:27:32 seanleyne Exp $
* Revision 1.5 2000/12/08 16:18:21 fsg
* Preliminary changes to get IB_BUILD_NO automatically
* increased on commits.
@ -38,6 +38,7 @@
* 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
*
*/
@ -119,10 +120,6 @@
#define FB_PLATFORM "PA"
#endif
#ifdef IMP
#define FB_PLATFORM "IM"
#endif
#ifdef sgi
#define FB_PLATFORM "SG"
#endif

7
src/jrd/llio.cpp
View File

@ -22,6 +22,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
*
*/
@ -58,16 +59,14 @@
# ifndef WIN_NT
# ifndef VMS
# include <fcntl.h>
# ifndef IMP
# include <sys/file.h>
# endif
# include <sys/file.h>
# else
# include <file.h>
# endif
# endif
#endif
#if (defined IMP || defined sparc)
#ifdef sparc
#include <unistd.h>
#endif

5
src/jrd/pag.cpp
View File

@ -22,6 +22,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
*
*/
@ -165,10 +166,6 @@ static BOOLEAN find_type(SLONG, WIN *, PAG *, USHORT, USHORT, UCHAR **,
#define CLASS 10
#endif
#ifdef IMP
#define CLASS 2
#endif
#ifdef M88K
#define CLASS 2
#endif

4
src/jrd/perf.cpp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
@ -86,9 +87,6 @@ extern void ftime();
#endif
#ifdef SHLIB_DEFS
#ifdef IMP
typedef SLONG clock_t;
#endif
#define times (*_libgds_times)
extern clock_t times();

14
src/jrd/shdef.h
View File

@ -19,26 +19,22 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#ifndef _JRD_SHDEF_H_
#define _JRD_SHDEF_H_
#include "../jrd/ib_stdio.h"
#ifndef IMP
#include <sys/times.h>
#endif
#include <sys/types.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifdef IMP
typedef int pid_t;
typedef unsigned int mode_t;
#endif
#define setjmp (*_libgds_setjmp)
#define sprintf (*_libgds_sprintf)
#define strlen (*_libgds_strlen)
@ -117,11 +113,7 @@ extern IB_FILE _iob[];
extern int abort();
extern void *memset();
extern pid_t getpid();
#ifndef IMP
extern void *memcpy();
#else
extern SCHAR *memcpy();
#endif
extern int shmdt();
extern int memcmp();
extern int ib_fprintf();

48
src/jrd/shrinit.cpp
View File

@ -19,6 +19,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#include "firebird.h"
@ -35,12 +38,6 @@
#define LOCAL_SHLIB_DEFS
#include "../jrd/common.h"
#ifdef IMP
typedef int pid_t;
typedef unsigned int mode_t;
typedef SLONG clock_t;
#endif
extern "C" {
@ -59,11 +56,7 @@ IB_FILE(*_libgds__iob) = 0;
int (*_libgds_abort) () = 0;
void *(*_libgds_memset) () = 0;
pid_t(*_libgds_getpid) () = 0;
#ifndef IMP
void *(*_libgds_memcpy) () = 0;
#else
SCHAR *(*_libgds_memcpy) () = 0;
#endif
int (*_libgds_shmdt) () = 0;
int (*_libgds_memcmp) () = 0;
int (*_libgds_fprintf) () = 0;
@ -126,11 +119,7 @@ int (*_libgds_write) () = 0;
mode_t(*_libgds_umask) () = 0;
int (*_libgds_lockf) () = 0;
int (*_libgds_shmget) () = 0;
#ifndef IMP
void *(*_libgds_shmat) () = 0;
#else
SCHAR *(*_libgds_shmat) () = 0;
#endif
int (*_libgds_shmctl) () = 0;
key_t(*_libgds_ftok) () = 0;
int (*_libgds_close) () = 0;
@ -210,11 +199,6 @@ SCHAR **(*_libgds_environ) () = 0;
IB_FILE *(*_libgds_fdopen) () = 0;
int (*_libgds_dup) () = 0;
int (*_libgds_execle) () = 0;
#ifdef IMP
bool_t(*_libgds_xdr_float) () = 0;
bool_t(*_libgds_xdr_double) () = 0;
int (*_libgds_sbrk) () = 0;
#endif
#ifdef SCO
bool_t(*_libgds_xdr_float) () = 0;
bool_t(*_libgds_xdr_double) () = 0;
@ -224,11 +208,7 @@ SCHAR *(*_libgds_strrchr) () = 0;
#ifndef SCO
int (*_libgds_fsync) () = 0;
#endif
#ifdef IMP
int (*_libgds_wait) () = 0;
#else
int (*_libgds_waitpid) () = 0;
#endif
void (*_libgds__exit) () = 0;
#ifdef SCO
IB_FILE *(*_libgds_popen) () = 0;
@ -241,9 +221,7 @@ int (*_libgds_atol) () = 0;
int (*_libgds_execvp) () = 0;
int (*_libgds_nice) () = 0;
int (*_libgds_putenv) () = 0;
#ifndef IMP
int (*_libgds_xdr_free) () = 0;
#endif
int (*_libgds_xdr_wrapstring) () = 0;
int (*_libgds_vsprintf) () = 0;
int (*_libgds_h_errno) = 0;
@ -255,15 +233,9 @@ int (*_libgds_access) () = 0;
#ifdef SCO
int (*_libgds_fsync) () = 0;
#endif
#ifndef IMP
int (*_libgds_sigsuspend) () = 0;
int (*_libgds_sigprocmask) () = 0;
int (*_libgds_sigaddset) () = 0;
#else
int (*_libgds_sigblock) () = 0;
int (*_libgds_sigsetmask) () = 0;
int (*_libgds_sigpause) () = 0;
#endif
/* WARNING: The definition and initialization of new imported symbol pointers
should be added at the end of the list ABOVE. At the same time,
@ -274,9 +246,6 @@ int (*_libgds_sigpause) () = 0;
modify it accordingly. All new InterBase global data must be
added at the end of the list BELOW. */
#ifdef IMP
int _libgds_padding[465] = 0;
#endif
#ifdef SCO
int _libgds_padding[466] = { 0 };
#endif
@ -294,15 +263,4 @@ int* DSQL_hash_table = 0;
void* gdbb = 0;
int* internal_db_handles = 0;
#ifdef IMP
/****
NOTE: The following variable was added because of an incompatibility
problem between the mkshlib and link utility in IMP. This is a
workaround and should be eliminated whenever IMP fixes the bug in
their utilities.
****/
char __StRet[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
#endif
} // extern "C"

10
src/jrd/svc.cpp
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 "IMP" port
*
*/
@ -437,11 +438,7 @@ static const serv services[] =
#ifdef SHLIB_DEFS
#define pipe (*_libgds_pipe)
#ifdef IMP
#define wait (*_libgds_wait)
#else
#define waitpid (*_libgds_waitpid)
#endif
#define _exit (*_libgds__exit)
#define dup (*_libgds_dup)
#define ib_fdopen (*_libgds_fdopen)
@ -449,11 +446,7 @@ static const serv services[] =
#define statistics (*_libgds_stat)
extern int pipe();
#ifdef IMP
extern pid_t wait();
#else
extern pid_t waitpid();
#endif
extern void _exit();
extern int dup();
extern IB_FILE *ib_fdopen();
@ -3940,4 +3933,3 @@ void test_cmd(USHORT spb_length, SCHAR * spb, TEXT ** switches)
gds__log("test_cmd called");
}
#endif

13
src/lock/lock.cpp
View File

@ -19,9 +19,12 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
/*
$Id: lock.cpp,v 1.5 2002-01-04 11:34:16 skywalker Exp $
$Id: lock.cpp,v 1.6 2002-02-16 03:27:32 seanleyne Exp $
*/
#include "firebird.h"
@ -341,22 +344,14 @@ static struct ipccfg LOCK_hdrtbl[] =
#ifdef SHLIB_DEFS
#define sys_errlist (*_libgds_sys_errlist)
#ifdef IMP
#define wait (*_libgds_wait)
#else
#define waitpid (*_libgds_waitpid)
#endif
#define execl (*_libgds_execl)
#define _exit (*_libgds__exit)
#define statistics (*_libgds_stat)
#define chmod (*_libgds_chmod)
extern SCHAR *sys_errlist[];
#ifdef IMP
extern int wait();
#else
extern int waitpid();
#endif
extern int execl();
extern void _exit();
extern int statistics();

5
src/lock/lock.h
View File

@ -22,6 +22,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
*
*/
@ -105,10 +106,6 @@
#define SEMAPHORES 25
#endif
#ifdef IMP
#define SEMAPHORES 25
#endif
#ifdef ultrix
#define SEMAPHORES 25
#endif

5
src/lock/lockv3.h
View File

@ -22,6 +22,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
*
*/
@ -79,10 +80,6 @@ union semun {
#define SEMAPHORES 25
#endif
#ifdef IMP
#define SEMAPHORES 25
#endif
#ifdef ultrix
#define SEMAPHORES 25
#endif

6
src/lock/printv3.cpp
View File

@ -19,14 +19,14 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <sys/param.h>
#ifdef IMP
#include <sys/types.h>
#endif
#include <sys/stat.h>
#include "../jrd/common.h"

2
src/make.new/config/config.h.in
View File

@ -2,6 +2,7 @@
* 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 "DELTA" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*/
#ifndef AUTOCONFIG_H
@ -71,6 +72,5 @@
#undef M88K
#undef UNIXWARE
#undef NCR3000
#undef IMP
#endif

2
src/makefiles/config/config.h.in
View File

@ -2,6 +2,7 @@
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "MAC" port (MAC/MAC_CP/MAC_AUX defines)
* 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
*/
#ifndef AUTOCONFIG_H
@ -61,6 +62,5 @@
#undef M88K
#undef UNIXWARE
#undef NCR3000
#undef IMP
#endif

9
src/remote/inet.cpp
View File

@ -24,10 +24,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
*
*/
/*
$Id: inet.cpp,v 1.7 2002-02-16 02:49:56 seanleyne Exp $
$Id: inet.cpp,v 1.8 2002-02-16 03:27:32 seanleyne Exp $
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
@ -117,10 +118,6 @@ NETDB_DEFINE_CONTEXT
#include "../jrd/sch_proto.h"
#endif /* REQUESTER */
#ifdef IMP
int h_errno; /* In Other platforms one of the system header files declares this */
#endif
#if (defined hpux || defined SCO_UNIX || defined mips)
extern int h_errno;
#endif
@ -185,10 +182,8 @@ typedef int socklen_t;
#endif
#ifdef SYSV_SIGNALS
#ifndef IMP
#define NO_ITIMER
#endif
#endif
#ifndef SYS_ERR
#define SYS_ERR gds_arg_unix

38
src/remote/protocol.cpp
View File

@ -19,6 +19,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#include "firebird.h"
@ -100,9 +103,7 @@ extern bool_t xdr_float();
extern bool_t xdr_double();
extern bool_t xdr_wrapstring();
# ifndef IMP
extern bool_t xdr_free();
# endif
#else // 0
@ -136,9 +137,7 @@ static STR gfloat_buffer;
# define xdr_double (*_libgds_xdr_double)
# endif
# define xdr_wrapstring (*_libgds_xdr_wrapstring)
# ifndef IMP
# define xdr_free (*_libgds_xdr_free)
# endif
# define xdr_free (*_libgds_xdr_free)
#if 0
// TMN: Patched away this for now, it should probably be removed.
@ -156,9 +155,7 @@ extern bool_t xdr_float();
extern bool_t xdr_double();
# endif // sgi
extern bool_t xdr_wrapstring();
# ifndef IMP
extern bool_t xdr_free();
# endif // IMP
#else // 0
@ -2072,33 +2069,6 @@ static bool_t xdr_float( register XDR * xdrs, register float *ip)
}
#endif
#ifdef IMP
/**
xdr_free is not available on Motorola IMP 5.3 1.0 mc68060 as system
call. This routine is copied from the file remote/xdr.c.
**/
bool_t xdr_free(xdrproc_t proc, SCHAR * objp)
{
/**************************************
*
* x d r _ f r e e
*
**************************************
*
* Functional description
* Perform XDR_FREE operation on an XDR structure
*
**************************************/
XDR xdrs;
xdrs.x_op = XDR_FREE;
return (*proc) (&xdrs, objp);
}
#endif
static RSR get_statement( XDR * xdrs, SSHORT statement_id)
{
/**************************************

5
src/remote/remote_def.h
View File

@ -23,6 +23,7 @@
* 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 "DELTA" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
@ -61,10 +62,6 @@
#endif
#endif
#ifdef IMP
#define ARCHITECTURE arch_imp
#endif
#ifdef M88K
#define ARCHITECTURE arch_m88k
#endif

6
src/utilities/dropv3.cpp
View File

@ -19,15 +19,15 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#include "firebird.h"
#include "../jrd/ib_stdio.h"
#include <errno.h>
#include <sys/param.h>
#ifdef IMP
#include <sys/types.h>
#endif
#include <sys/stat.h>
#include <stdlib.h>

11
src/wal/wal.cpp
View File

@ -19,6 +19,9 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
#include "firebird.h"
@ -108,19 +111,11 @@ static SSHORT wal_put2(STATUS *, WAL, UCHAR *, USHORT, UCHAR *, USHORT,
#ifdef SHLIB_DEFS
#define execl (*_libgds_execl)
#ifdef IMP
#define wait (*_libgds_wait)
#else
#define waitpid (*_libgds_waitpid)
#endif
#define _exit (*_libgds__exit)
extern int execl();
#ifdef IMP
extern int wait();
#else
extern int waitpid();
#endif
extern void _exit();
#endif

4
src/wal/wal.h
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
@ -34,9 +35,6 @@
#define FCNTL_INCLUDED
#endif
#endif
#ifdef IMP
#include <sys/types.h>
#endif
#include "../jrd/common.h"
#include "../jrd/misc.h"
#include "../jrd/isc.h"

7
src/wal/walw.cpp
View File

@ -21,6 +21,7 @@
* Contributor(s): ______________________________________.
*
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "DELTA" port
* 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "IMP" port
*
*/
@ -59,11 +60,9 @@
#if !(defined WIN_NT)
#ifndef VMS
#include <sys/types.h>
#ifndef IMP
#ifndef NETWARE_386
#include <sys/file.h>
#endif
#endif
#else
#include <types.h>
#include <file.h>
@ -72,12 +71,10 @@
#include <signal.h>
#endif
#ifdef IMP
#include <unistd.h>
#endif
#ifdef sparc
#include <unistd.h>
#endif
#ifdef UNIX
#include <sys/stat.h>
#endif