Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6ece8a8

Browse files
author
Bryan Henderson
committed
Part of patch to make a working nextstep port.
1 parent0d3bf78 commit6ece8a8

File tree

5 files changed

+42
-25
lines changed

5 files changed

+42
-25
lines changed

‎src/Makefile.global

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.86 1997/01/10 19:30:08 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.87 1997/01/13 03:52:00 bryanh Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -55,9 +55,9 @@
5555
# irix5 SGI MIPS on IRIX 5.3 or better
5656
# linux Intel x86 on Linux 1.2 and Linux ELF
5757
# (For non-ELF Linux, see LINUX_ELF below).
58-
#nextMotorola MC68K or Intel x86 on NeXTSTEP 3.2
58+
#nextstep Motorola MC68K or Intel x86 on NeXTSTEP 3.2 or greater
5959
# sparc_solaris SUN SPARC on Solaris 2.4
60-
# sunos4SUN SPARC on SunOS 4.1.3
60+
# sunos4 SUN SPARC on SunOS 4.1.3
6161
# svr4 Intel x86 on Intel SVR4
6262
# ultrix4 DEC MIPS on Ultrix 4.4
6363
#
@@ -701,8 +701,10 @@ DLSUFFIX= .o
701701
endif
702702

703703

704-
ifneq ($(PORTNAME), next)
705-
LDADD_BE+= -lm
704+
ifneq ($(PORTNAME), nextstep)
705+
LDADD_BE+= -lIPC
706+
AROPT= rc
707+
DLSUFFIX= .o
706708
endif
707709

708710
# This goes here so that customization in Makefile.custom is effective

‎src/backend/optimizer/path/costsize.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.8 1997/01/08 10:33:46 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.9 1997/01/13 03:54:15 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

1515
#include"postgres.h"
16+
#include"config.h"
1617

1718
#include<math.h>
1819
#ifdefWIN32
@@ -24,7 +25,9 @@
2425
# include<machine/limits.h>
2526
# defineMAXINTINT_MAX
2627
# else
27-
# include<values.h>
28+
# ifdefUSE_VALUES_H
29+
# include<values.h>
30+
# endif
2831
# endif
2932
#endif
3033

‎src/backend/port/Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# be converted to Method 2.
2020
#
2121
# IDENTIFICATION
22-
# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.5 1996/11/26 03:18:38 bryanh Exp $
22+
# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.6 1997/01/13 03:54:20 bryanh Exp $
2323
#
2424
#-------------------------------------------------------------------------
2525

@@ -31,12 +31,7 @@ else
3131

3232
OBJS =$(PORTNAME)/SUBSYS.o
3333

34-
ifeq ($(PORTNAME), sparc_solaris)
35-
# Other ports get the inet_aton() function from their standard C libraries.
36-
OBJS += inet_aton.o
37-
endif
38-
39-
ifeq ($(PORTNAME), ultrix4)
34+
ifneq ($(findstring /$(PORTNAME)/, /sparc_solaris/ultrix4/nextstep/))
4035
# Other ports get the inet_aton() function from their standard C libraries.
4136
OBJS += inet_aton.o
4237
endif

‎src/include/config.h

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
#defineTERMIOS_H_LOCATION <sys/termios.h>
1515
#endif
1616

17+
#if !defined(nextstep)
18+
#defineUSE_VALUES_H
19+
#endif
20+
1721
#defineHAVE_MEMMOVE
1822

1923
#if defined(aix)
@@ -138,16 +142,29 @@
138142
typedefunsignedcharslock_t;
139143
#endif
140144

141-
/* does anybody use this? */
142-
#if defined(next)
145+
#if defined(nextstep)
146+
# include<sys/ioctl.h>
143147
# if defined(__STRICT_ANSI__)
144148
# defineisascii(c) ((unsigned)(c)<=0177)
145149
# endif
146-
# defineUSE_LIMITS_H
147-
# defineJMP_BUF
150+
externchar*strdup (constchar*string);
151+
# ifndef_POSIX_SOURCE
152+
typedefunsigned shortmode_t;
153+
typedefintsigset_t;
154+
# defineSIG_BLOCK00
155+
# defineSIG_UNBLOCK01
156+
# defineSIG_SETMASK02
157+
# defineNO_SIGACTION
158+
# defineNO_SETSID
159+
# defineNO_SIGPROCMASK
148160
# defineNEED_SIG_JMP
149-
# defineSB_PAD 56
150-
typedefstructmutexslock_t;
161+
# endif
162+
163+
# defineUSE_LIMITS_H
164+
# defineJMP_BUF
165+
# defineSB_PAD 56
166+
# defineNO_WAITPID
167+
typedefstructmutexslock_t;
151168
#endif
152169

153170
#if defined(sequent)

‎src/include/storage/ipc.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: ipc.h,v 1.11 1996/12/04 03:06:29 bryanh Exp $
9+
* $Id: ipc.h,v 1.12 1997/01/13 03:54:48 bryanh Exp $
1010
*
1111
* NOTES
1212
* This file is very architecture-specific. This stuff should actually
1313
* be factored into the port/ directories.
1414
*
15+
* Some files that would normally need to include only sys/ipc.h must
16+
* instead included this file because on Ultrix, sys/ipc.h is not designed
17+
* to be included multiple times. This file (by virtue of the ifndef IPC_H)
18+
* is.
1519
*-------------------------------------------------------------------------
1620
*/
1721
#ifndefIPC_H
1822
#defineIPC_H
1923

20-
#ifndef_IPC_
21-
#define_IPC_
22-
#endif
23-
2424
#include<sys/types.h>
2525
#include<sys/ipc.h>/* For IPC_PRIVATE */
2626

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp