I have removed the BEOS port with the attached patch. This has been
discussed for several releases, and the port seems to have no current
users.
--
Bruce Momjian | http://candle.pha.pa.us
pgman@candle.pha.pa.us | (610) 359-1001
+ If your life is a hard drive, | 13 Roberts Road
+ Christ can be your backup. | Newtown Square, Pennsylvania 19073
Index: configure
===================================================================
RCS file: /cvsroot/pgsql/configure,v
retrieving revision 1.470
diff -c -c -r1.470 configure
*** configure 5 Jan 2006 01:56:23 -0000 1.470
--- configure 5 Jan 2006 02:59:15 -0000
***************
*** 1496,1502 ****
case $host_os in
aix*) template=aix ;;
- beos*) template=beos ;;
bsdi*) template=bsdi ;;
cygwin*) template=cygwin ;;
darwin*) template=darwin ;;
--- 1496,1501 ----
***************
*** 6166,6249 ****
fi
- # BeOS:
- if test "$PORTNAME" = "beos"
- then
-
- echo "$as_me:$LINENO: checking for __inet_ntoa in -lbind" >&5
- echo $ECHO_N "checking for __inet_ntoa in -lbind... $ECHO_C" >&6
- if test "${ac_cv_lib_bind___inet_ntoa+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbind $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
- extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
- char __inet_ntoa ();
- int
- main ()
- {
- __inet_ntoa ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_bind___inet_ntoa=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_bind___inet_ntoa=no
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_bind___inet_ntoa" >&5
- echo "${ECHO_T}$ac_cv_lib_bind___inet_ntoa" >&6
- if test $ac_cv_lib_bind___inet_ntoa = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBBIND 1
- _ACEOF
-
- LIBS="-lbind $LIBS"
-
- fi
-
- fi
# Solaris:
echo "$as_me:$LINENO: checking for library containing fdatasync" >&5
echo $ECHO_N "checking for library containing fdatasync... $ECHO_C" >&6
--- 6165,6170 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql/configure.in,v
retrieving revision 1.440
diff -c -c -r1.440 configure.in
*** configure.in 5 Jan 2006 01:56:28 -0000 1.440
--- configure.in 5 Jan 2006 02:59:16 -0000
***************
*** 49,55 ****
case $host_os in
aix*) template=aix ;;
- beos*) template=beos ;;
bsdi*) template=bsdi ;;
cygwin*) template=cygwin ;;
darwin*) template=darwin ;;
--- 49,54 ----
***************
*** 614,624 ****
# QNX:
AC_CHECK_LIB(unix, main)
AC_SEARCH_LIBS(crypt, crypt)
- # BeOS:
- if test "$PORTNAME" = "beos"
- then
- AC_CHECK_LIB(bind, __inet_ntoa)
- fi
# Solaris:
AC_SEARCH_LIBS(fdatasync, [rt posix4])
# Cygwin:
--- 613,618 ----
Index: doc/src/sgml/installation.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v
retrieving revision 1.251
diff -c -c -r1.251 installation.sgml
*** doc/src/sgml/installation.sgml 5 Jan 2006 01:56:28 -0000 1.251
--- doc/src/sgml/installation.sgml 5 Jan 2006 02:59:17 -0000
***************
*** 1996,2008 ****
<tbody>
<row>
- cvs diff: src/backend/port/beos/Makefile was removed, no comparison available <entry><systemitem
class="osname">BeOS</></entry>
- <entry><systemitem>x86</></entry>
- <entry>7.2</entry>
- <entry>Cyril Velter (<email>cyril.velter@libertysurf.fr</email>), 2001-11-29</entry>
- <entry>needs updates to semaphore code</entry>
- </row>
- <row>
<entry><systemitem class="osname">Linux</></entry>
<entry><systemitem>PlayStation 2</></entry>
<entry>8.0.0</entry>
--- 1996,2001 ----
Index: doc/src/sgml/runtime.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v
retrieving revision 1.360
diff -c -c -r1.360 runtime.sgml
*** doc/src/sgml/runtime.sgml 5 Jan 2006 01:56:28 -0000 1.360
--- doc/src/sgml/runtime.sgml 5 Jan 2006 02:59:18 -0000
***************
*** 480,488 ****
relevant for <productname>PostgreSQL</>). Almost all modern
operating systems provide these features, but not all of them have
them turned on or sufficiently sized by default, especially systems
! with BSD heritage. (For the <systemitem class="osname">Windows</> and
! <systemitem class="osname">BeOS</> ports, <productname>PostgreSQL</>
! provides its own replacement implementation of these facilities.)
</para>
<para>
--- 480,488 ----
relevant for <productname>PostgreSQL</>). Almost all modern
operating systems provide these features, but not all of them have
them turned on or sufficiently sized by default, especially systems
! with BSD heritage. (For the <systemitem class="osname">Windows</>
! port, <productname>PostgreSQL</> provides its own replacement
! implementation of these facilities.)
</para>
<para>
Index: src/Makefile.shlib
===================================================================
RCS file: /cvsroot/pgsql/src/Makefile.shlib,v
retrieving revision 1.101
diff -c -c -r1.101 Makefile.shlib
*** src/Makefile.shlib 30 Dec 2005 21:43:41 -0000 1.101
--- src/Makefile.shlib 5 Jan 2006 02:59:19 -0000
***************
*** 246,257 ****
haslibarule = yes
endif
- ifeq ($(PORTNAME), beos)
- shlib = lib$(NAME)$(DLSUFFIX)
- LINK.shared = $(LD) -nostart
- SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86
- endif
-
ifeq ($(enable_rpath), yes)
SHLIB_LINK += $(rpath)
endif
--- 246,251 ----
***************
*** 290,296 ****
ifneq ($(PORTNAME), win32)
ifneq ($(PORTNAME), cygwin)
- ifneq ($(PORTNAME), beos)
ifneq ($(PORTNAME), aix)
# Normal case
--- 284,289 ----
***************
*** 316,330 ****
endif # PORTNAME == aix
- else # PORTNAME == beos
-
- # BEOS case
- $(shlib): $(OBJS)
- ln -fs $(top_srcdir)/src/backend/postgres _APP_
- $(CC) -Xlinker -soname=$@ $(LDFLAGS_SL) -o $@ _APP_ $(OBJS) $(SHLIB_LINK)
-
- endif # PORTNAME == beos
-
else # PORTNAME == cygwin
# Cygwin case
--- 309,314 ----
Index: src/backend/main/main.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/main/main.c,v
retrieving revision 1.98
diff -c -c -r1.98 main.c
*** src/backend/main/main.c 28 Dec 2005 23:22:51 -0000 1.98
--- src/backend/main/main.c 5 Jan 2006 02:59:19 -0000
***************
*** 118,128 ****
}
#endif
- #ifdef __BEOS__
- /* BeOS-specific actions on startup */
- beos_startup(argc, argv);
- #endif
-
/*
* Not-quite-so-platform-specific startup environment checks. Still best
* to minimize these.
--- 118,123 ----
***************
*** 205,217 ****
strcmp(argv[1], "-V") == 0)))
{
#ifndef WIN32
- #ifndef __BEOS__
-
/*
* Make sure we are not running as root.
- *
- * BeOS currently runs everything as root :-(, so this check must be
- * temporarily disabled there...
*/
if (geteuid() == 0)
{
--- 200,207 ----
***************
*** 221,227 ****
"more information on how to properly start the server.\n");
exit(1);
}
- #endif /* !__BEOS__ */
/*
* Also make sure that real and effective uids are the same. Executing
--- 211,216 ----
Index: src/b
cvs diff: src/backend/port/beos/sem.c was removed, no comparison available
cvs diff: src/backend/port/beos/shm.c was removed, no comparison available
cvs diff: src/backend/port/beos/support.c was removed, no comparison available
cvs diff: src/backend/port/dynloader/beos.c was removed, no comparison available
cvs diff: src/backend/port/dynloader/beos.h was removed, no comparison available
ackend/port/Makefile
===================================================================
RCS file: /cvsroot/pgsql/src/backend/port/Makefile,v
retrieving revision 1.21
diff -c -c -r1.21 Makefile
*** src/backend/port/Makefile 5 Jan 2006 01:56:29 -0000 1.21
--- src/backend/port/Makefile 5 Jan 2006 02:59:19 -0000
***************
*** 25,33 ****
OBJS+=$(TAS)
- ifeq ($(PORTNAME), beos)
- OBJS+=beos/SUBSYS.o
- endif
ifeq ($(PORTNAME), darwin)
OBJS+=darwin/SUBSYS.o
endif
--- 25,30 ----
***************
*** 40,50 ****
SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) $@ $^
- beos/SUBSYS.o: beos.dir
-
- beos.dir:
- $(MAKE) -C beos all
-
darwin/SUBSYS.o: darwin.dir
darwin.dir:
--- 37,42 ----
***************
*** 64,70 ****
distclean clean:
rm -f SUBSYS.o $(OBJS) ipc_test ipc_test.o
- $(MAKE) -C beos clean
$(MAKE) -C darwin clean
$(MAKE) -C win32 clean
--- 56,61 ----
Index: src/backend/postmaster/fork_process.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/postmaster/fork_process.c,v
retrieving revision 1.4
diff -c -c -r1.4 fork_process.c
*** src/backend/postmaster/fork_process.c 15 Oct 2005 02:49:23 -0000 1.4
--- src/backend/postmaster/fork_process.c 5 Jan 2006 02:59:19 -0000
***************
*** 52,82 ****
getitimer(ITIMER_PROF, &prof_itimer);
#endif
- #ifdef __BEOS__
- /* Specific beos actions before backend startup */
- beos_before_backend_startup();
- #endif
-
result = fork();
! if (result == (pid_t) -1)
! {
! /* fork failed */
! #ifdef __BEOS__
! /* Specific beos backend startup actions */
! beos_backend_startup_failed();
! #endif
! }
! else if (result == 0)
{
/* fork succeeded, in child */
#ifdef LINUX_PROFILE
setitimer(ITIMER_PROF, &prof_itimer, NULL);
#endif
- #ifdef __BEOS__
- /* Specific beos backend startup actions */
- beos_backend_startup();
- #endif
}
return result;
--- 52,65 ----
getitimer(ITIMER_PROF, &prof_itimer);
#endif
result = fork();
! if (result == 0)
{
/* fork succeeded, in child */
#ifdef LINUX_PROFILE
setitimer(ITIMER_PROF, &prof_itimer, NULL);
#endif
}
return result;
Index: src/backend/storage/lmgr/proc.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v
retrieving revision 1.171
diff -c -c -r1.171 proc.c
*** src/backend/storage/lmgr/proc.c 4 Jan 2006 21:06:31 -0000 1.171
--- src/backend/storage/lmgr/proc.c 5 Jan 2006 02:59:22 -0000
***************
*** 1113,1124 ****
enable_sig_alarm(int delayms, bool is_statement_timeout)
{
struct timeval fin_time;
-
- #ifndef __BEOS__
struct itimerval timeval;
- #else
- bigtime_t time_interval;
- #endif
/* Compute target timeout time if we will need it */
if (is_statement_timeout || statement_timeout_active)
--- 1113,1119 ----
***************
*** 1170,1187 ****
}
/* If we reach here, okay to set the timer interrupt */
- #ifndef __BEOS__
MemSet(&timeval, 0, sizeof(struct itimerval));
timeval.it_value.tv_sec = delayms / 1000;
timeval.it_value.tv_usec = (delayms % 1000) * 1000;
if (setitimer(ITIMER_REAL, &timeval, NULL))
return false;
- #else
- /* BeOS doesn't have setitimer, but has set_alarm */
- time_interval = delayms * 1000; /* usecs */
- if (set_alarm(time_interval, B_ONE_SHOT_RELATIVE_ALARM) < 0)
- return false;
- #endif
return true;
}
--- 1165,1175 ----
***************
*** 1204,1210 ****
*/
if (statement_timeout_active || deadlock_timeout_active)
{
- #ifndef __BEOS__
struct itimerval timeval;
MemSet(&timeval, 0, sizeof(struct itimerval));
--- 1192,1197 ----
***************
*** 1215,1230 ****
deadlock_timeout_active = false;
return false;
}
- #else
- /* BeOS doesn't have setitimer, but has set_alarm */
- if (set_alarm(B_INFINITE_TIMEOUT, B_PERIODIC_ALARM) < 0)
- {
- statement_timeout_active = false;
- cancel_from_timeout = false;
- deadlock_timeout_active = false;
- return false;
- }
- #endif
}
/* Always cancel deadlock timeout, in case this is error cleanup */
--- 1202,1207 ----
***************
*** 1274,1280 ****
else
{
/* Not time yet, so (re)schedule the interrupt */
- #ifndef __BEOS__
struct itimerval timeval;
MemSet(&timeval, 0, sizeof(struct itimerval));
--- 1251,1256 ----
***************
*** 1287,1302 ****
}
if (setitimer(ITIMER_REAL, &timeval, NULL))
return false;
- #else
- /* BeOS doesn't have setitimer, but has set_alarm */
- bigtime_t time_interval;
-
- time_interval =
- (statement_fin_time.tv_sec - now.tv_sec) * 1000000 +
- (statement_fin_time.tv_usec - now.tv_usec);
- if (set_alarm(time_interval, B_ONE_SHOT_RELATIVE_ALARM) < 0)
- return false;
- #endif
}
return true;
--- 1263,1268 ----
Index: src/backend/tcop/postgres.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/tcop/postgres.c,v
retrieving revision 1.475
diff -c -c -r1.475 postgres.c
*** src/backend/tcop/postgres.c 4 Jan 2006 21:06:31 -0000 1.475
--- src/backend/tcop/postgres.c 5 Jan 2006 02:59:26 -0000
***************
*** 3520,3526 ****
(long) user.tv_usec,
(long) sys.tv_sec,
(long) sys.tv_usec);
- /* BeOS has rusage but only has some fields, and not these... */
#if defined(HAVE_GETRUSAGE)
appendStringInfo(&str,
"!\t%ld/%ld [%ld/%ld] filesystem blocks in/out\n",
--- 3520,3525 ----
Index: src/backend/utils/init/miscinit.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v
retrieving revision 1.151
diff -c -c -r1.151 miscinit.c
*** src/backend/utils/init/miscinit.c 22 Nov 2005 18:17:25 -0000 1.151
--- src/backend/utils/init/miscinit.c 5 Jan 2006 02:59:26 -0000
***************
*** 777,783 ****
* using real kill() either...
*
* Normally kill() will fail with ESRCH if the given PID doesn't
! * exist. BeOS returns EINVAL for some silly reason, however.
*/
if (other_pid != my_pid
#ifndef WIN32
--- 777,783 ----
* using real kill() either...
*
* Normally kill() will fail with ESRCH if the given PID doesn't
! * exist.
*/
if (other_pid != my_pid
#ifndef WIN32
***************
*** 786,796 ****
)
{
if (kill(other_pid, 0) == 0 ||
! (errno != ESRCH &&
! #ifdef __BEOS__
! errno != EINVAL &&
! #endif
! errno != EPERM))
{
/* lockfile belongs to a live process */
ereport(FATAL,
--- 786,792 ----
)
{
if (kill(other_pid, 0) == 0 ||
! (errno != ESRCH && errno != EPERM))
{
/* lockfile belongs to a live process */
ereport(FATAL,
Index: src/bin/initdb/initdb.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/initdb/initdb.c,v
retrieving revision 1.104
diff -c -c -r1.104 initdb.c
*** src/bin/initdb/initdb.c 2 Jan 2006 16:45:12 -0000 1.104
--- src/bin/initdb/initdb.c 5 Jan 2006 02:59:27 -0000
***************
*** 633,640 ****
pw = getpwuid(geteuid());
- #ifndef __BEOS__ /* no root check on BEOS */
-
if (geteuid() == 0) /* 0 is root's uid */
{
fprintf(stderr,
--- 633,638 ----
***************
*** 645,651 ****
progname);
exit(1);
}
- #endif
#else /* the windows code */
struct passwd_win32
--- 643,648 ----
Index: src/bin/pg_ctl/pg_ctl.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_ctl/pg_ctl.c,v
retrieving revision 1.62
diff -c -c -r1.62 pg_ctl.c
*** src/bin/pg_ctl/pg_ctl.c 22 Nov 2005 18:17:28 -0000 1.62
--- src/bin/pg_ctl/pg_ctl.c 5 Jan 2006 02:59:28 -0000
***************
*** 1322,1328 ****
* Disallow running as root, to forestall any possible security holes.
*/
#ifndef WIN32
- #ifndef __BEOS__ /* no root check on BEOS */
if (geteuid() == 0)
{
write_stderr(_("%s: cannot be run as root\n"
--- 1322,1327 ----
***************
*** 1333,1339 ****
exit(1);
}
#endif
- #endif
/*
* 'Action' can be beforecvs diff: src/include/port/beos.h was removed, no comparison available
cvs diff: src/makefiles/Makefile.beos was removed, no comparison available
or after args so loop over both. Some
--- 1332,1337 ----
Index: src/bin/pg_resetxlog/pg_resetxlog.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v
retrieving revision 1.38
diff -c -c -r1.38 pg_resetxlog.c
*** src/bin/pg_resetxlog/pg_resetxlog.c 15 Oct 2005 02:49:40 -0000 1.38
--- src/bin/pg_resetxlog/pg_resetxlog.c 5 Jan 2006 02:59:28 -0000
***************
*** 220,226 ****
* the data directory.
*/
#ifndef WIN32
- #ifndef __BEOS__ /* no root check on BeOS */
if (geteuid() == 0)
{
fprintf(stderr, _("%s: cannot be executed by \"root\"\n"),
--- 220,225 ----
***************
*** 230,236 ****
exit(1);
}
#endif
- #endif
DataDir = argv[optind];
--- 229,234 ----
Index: src/include/c.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/c.h,v
retrieving revision 1.193
diff -c -c -r1.193 c.h
*** src/include/c.h 25 Dec 2005 02:14:18 -0000 1.193
--- src/include/c.h 5 Jan 2006 02:59:29 -0000
***************
*** 170,180 ****
* built-in definition of bool.
*/
- /* BeOS defines bool already, but the compiler chokes on the
- * #ifndef unless we wrap it in this check.
- */
- #ifndef __BEOS__
-
#ifndef __cplusplus
#ifndef bool
--- 170,175 ----
***************
*** 189,195 ****
#define false ((bool) 0)
#endif
#endif /* not C++ */
- #endif /* __BEOS__ */
typedef bool *BoolPtr;
--- 184,189 ----
Index: src/include/pg_config.h.in
===================================================================
RCS file: /cvsroot/pgsql/src/include/pg_config.h.in,v
retrieving revision 1.88
diff -c -c -r1.88 pg_config.h.in
*** src/include/pg_config.h.in 6 Dec 2005 02:29:03 -0000 1.88
--- src/include/pg_config.h.in 5 Jan 2006 02:59:30 -0000
***************
*** 200,208 ****
/* Define to 1 if you have the <langinfo.h> header file. */
#undef HAVE_LANGINFO_H
- /* Define to 1 if you have the `bind' library (-lbind). */
- #undef HAVE_LIBBIND
-
/* Define to 1 if you have the `BSD' library (-lBSD). */
#undef HAVE_LIBBSD
--- 200,205 ----
Index: src/include/pg_config_manual.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/pg_config_manual.h,v
retrieving revision 1.19
diff -c -c -r1.19 pg_config_manual.h
*** src/include/pg_config_manual.h 5 Jan 2006 01:56:29 -0000 1.19
--- src/include/pg_config_manual.h 5 Jan 2006 02:59:30 -0000
***************
*** 155,169 ****
/*
* Disable UNIX sockets for those operating system.
*/
! #if defined(__BEOS__) || defined(WIN32)
#undef HAVE_UNIX_SOCKETS
#endif
/*
* Define this if your operating system supports link()
*/
! #if !defined(__BEOS__) && \
! !defined(WIN32) && !defined(__CYGWIN__)
#define HAVE_WORKING_LINK 1
#endif
--- 155,168 ----
/*
* Disable UNIX sockets for those operating system.
*/
! #if defined(WIN32)
#undef HAVE_UNIX_SOCKETS
#endif
/*
* Define this if your operating system supports link()
*/
! #if !defined(WIN32) && !defined(__CYGWIN__)
#define HAVE_WORKING_LINK 1
#endif
Index: src/interfaces/ecpg/include/ecpglib.h
===================================================================
RCS file: /cvsroot/pgsql/src/interfaces/ecpg/include/ecpglib.h,v
retrieving revision 1.64
diff -c -c -r1.64 ecpglib.h
*** src/interfaces/ecpg/include/ecpglib.h 30 Nov 2005 12:49:49 -0000 1.64
--- src/interfaces/ecpg/include/ecpglib.h 5 Jan 2006 02:59:30 -0000
***************
*** 10,16 ****
#include "ecpgtype.h"
#include <string.h>
- #ifndef __BEOS__
#ifndef __cplusplus
#ifndef bool
#define bool char
--- 10,15 ----
***************
*** 23,31 ****
#define false ((bool) 0)
#endif /* ndef false */
#endif /* not C++ */
- #else /* __BEOS__ */
- #include <SupportDefs.h>
- #endif /* __BEOS__ */
#ifndef TRUE
#define TRUE 1
--- 22,27 ----
Index: src/port/noblock.c
===================================================================
RCS file: /cvsroot/pgsql/src/port/noblock.c,v
retricvs diff: src/template/beos was removed, no comparison available
eving revision 1.8
diff -c -c -r1.8 noblock.c
*** src/port/noblock.c 15 Oct 2005 02:49:51 -0000 1.8
--- src/port/noblock.c 5 Jan 2006 02:59:30 -0000
***************
*** 20,45 ****
bool
pg_set_noblock(int sock)
{
! #if !defined(WIN32) && !defined(__BEOS__)
return (fcntl(sock, F_SETFL, O_NONBLOCK) != -1);
#else
long ioctlsocket_ret = 1;
/* Returns non-0 on failure, while fcntl() returns -1 on failure */
- #ifdef WIN32
return (ioctlsocket(sock, FIONBIO, &ioctlsocket_ret) == 0);
#endif
- #ifdef __BEOS__
- return (ioctl(sock, FIONBIO, &ioctlsocket_ret) == 0);
- #endif
- #endif
}
bool
pg_set_block(int sock)
{
! #if !defined(WIN32) && !defined(__BEOS__)
int flags;
flags = fcntl(sock, F_GETFL);
--- 20,40 ----
bool
pg_set_noblock(int sock)
{
! #if !defined(WIN32)
return (fcntl(sock, F_SETFL, O_NONBLOCK) != -1);
#else
long ioctlsocket_ret = 1;
/* Returns non-0 on failure, while fcntl() returns -1 on failure */
return (ioctlsocket(sock, FIONBIO, &ioctlsocket_ret) == 0);
#endif
}
bool
pg_set_block(int sock)
{
! #if !defined(WIN32)
int flags;
flags = fcntl(sock, F_GETFL);
***************
*** 50,60 ****
long ioctlsocket_ret = 0;
/* Returns non-0 on failure, while fcntl() returns -1 on failure */
- #ifdef WIN32
return (ioctlsocket(sock, FIONBIO, &ioctlsocket_ret) == 0);
#endif
- #ifdef __BEOS__
- return (ioctl(sock, FIONBIO, &ioctlsocket_ret) == 0);
- #endif
- #endif
}
--- 45,50 ----
Index: src/test/regress/pg_regress.sh
===================================================================
RCS file: /cvsroot/pgsql/src/test/regress/pg_regress.sh,v
retrieving revision 1.63
diff -c -c -r1.63 pg_regress.sh
*** src/test/regress/pg_regress.sh 5 Jan 2006 01:56:30 -0000 1.63
--- src/test/regress/pg_regress.sh 5 Jan 2006 02:59:31 -0000
***************
*** 216,222 ****
# On some platforms we can't use Unix sockets.
# ----------
case $host_platform in
! *-*-cygwin* | *-*-mingw32* | *beos*)
unix_sockets=no;;
*)
unix_sockets=yes;;
--- 216,222 ----
# On some platforms we can't use Unix sockets.
# ----------
case $host_platform in
! *-*-cygwin* | *-*-mingw32*)
unix_sockets=no;;
*)
unix_sockets=yes;;
