Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/test/test_fcntl.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def get_lockdata():
fcntl.F_WRLCK, 0)
elif sys.platform.startswith('gnukfreebsd'):
lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0)
elif sys.platform in ['hp-uxB', 'unixware7']:
elif sys.platform == 'hp-uxB':
lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
else:
lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Remove dead build and preprocessor code for SCO UnixWare, OpenUNIX, SCO
OpenServer and ReliantUNIX.
2 changes: 1 addition & 1 deletion Modules/_cursesmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static const char PyCursesVersion[] = "2.2";
#include <langinfo.h>
#endif

#if !defined(NCURSES_VERSION) && (defined(__sun) || defined(SCO5))
#if !defined(NCURSES_VERSION) && defined(__sun)
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
typedef chtype attr_t; /* No attr_t type is available */
#endif
Expand Down
5 changes: 0 additions & 5 deletions Modules/posixmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -14146,11 +14146,6 @@ os_WSTOPSIG_impl(PyObject *module, int status)


#if defined(HAVE_FSTATVFS) && defined(HAVE_SYS_STATVFS_H)
#ifdef _SCO_DS
/* SCO OpenServer 5.0 and later requires _SVID3 before it reveals the
needed definitions in sys/statvfs.h */
#define _SVID3
#endif
#include <sys/statvfs.h>

#ifdef __APPLE__
Expand Down
3 changes: 1 addition & 2 deletions PC/pyconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
/* Define if you have the putenv function. */
#define HAVE_PUTENV

/* Define if you can safely include both <sys/select.h> and <sys/time.h>
(which you can't on SCO ODT 3.0). */
/* Define if you can safely include both <sys/select.h> and <sys/time.h> */
/* #undef SYS_SELECT_WITH_SYS_TIME */

/* Define if you want build the _decimal module using a coroutine-local rather
Expand Down
1 change: 0 additions & 1 deletion Tools/build/check_capi_macros_ignored.txt
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,6 @@ SSTATE_INTERNED_IMMORTAL_STATIC
SSTATE_INTERNED_MORTAL
SSTATE_NOT_INTERNED
STDC_HEADERS
STRICT_SYSV_CURSES
SYS_SELECT_WITH_SYS_TIME
S_IFLNK
S_IFMT
Expand Down
64 changes: 1 addition & 63 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 2 additions & 67 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,6 @@ AH_TOP([
#define Py_PYCONFIG_H
])
AH_BOTTOM([
/* Define the macros needed if on a UnixWare 7.x system. */
#if defined(__USLC__) && defined(__SCO_VERSION__)
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
#endif

#endif /*Py_PYCONFIG_H*/
])

Expand Down Expand Up @@ -377,8 +372,7 @@ then
ac_sys_release=
else
ac_sys_system=`uname -s`
if test "$ac_sys_system" = "AIX" \
-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
if test "$ac_sys_system" = "AIX"; then
ac_sys_release=`uname -v`
else
ac_sys_release=`uname -r`
Expand Down Expand Up @@ -1019,15 +1013,6 @@ case $ac_sys_system/$ac_sys_release in
# A lower level is defined below.
SunOS/*)
define_xopen_source=no;;
# On UnixWare 7, u_long is never defined with _XOPEN_SOURCE,
# but used in /usr/include/netinet/tcp.h. Reported by Tim Rice.
# Reconfirmed for 7.1.4 by Martin v. Loewis.
OpenUNIX/8.0.0| UnixWare/7.1.@<:@0-4@:>@)
define_xopen_source=no;;
# On OpenServer 5, u_short is never defined with _XOPEN_SOURCE,
# but used in struct sockaddr.sa_family. Reported by Tim Rice.
SCO_SV/3.2)
define_xopen_source=no;;
# On MacOS X 10.2, a bug in ncurses.h means that it craps out if
# _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
# identifies itself as Darwin/7.*
Expand Down Expand Up @@ -2622,11 +2607,6 @@ then
OPT="-O3 -Wall"
;;
esac

case $ac_sys_system in
SCO_SV*) OPT="$OPT -m486 -DSCO5"
;;
esac
;;

*)
Expand Down Expand Up @@ -2994,10 +2974,6 @@ AS_VAR_IF([ac_cv_gcc_compat], [yes], [
esac

case $ac_sys_system in
SCO_SV*)
BASECFLAGS="$BASECFLAGS -m486 -DSCO5"
;;

Darwin*)
# -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
# used to be here, but non-Apple gcc doesn't accept them.
Expand Down Expand Up @@ -3151,15 +3127,6 @@ AS_VAR_IF([ac_cv_gcc_compat], [yes], [
# end of Darwin* tests
;;
esac
], [
case $ac_sys_system in
OpenUNIX*|UnixWare*)
BASECFLAGS="$BASECFLAGS -K pentium,host,inline,loop_unroll,alloca "
;;
SCO_SV*)
BASECFLAGS="$BASECFLAGS -belf -Ki486 -DSCO5"
;;
esac
])

# Check for --enable-experimental-jit:
Expand Down Expand Up @@ -3542,13 +3509,6 @@ AC_DEFINE([_FILE_OFFSET_BITS], [64],
[This must be set to 64 on some systems to enable large file support.])
fi

# Add some code to confdefs.h so that the test for off_t works on SCO
cat >> confdefs.h <<\EOF
#if defined(SCO_DS)
#undef _OFF_T
#endif
EOF

# Type availability checks
AC_TYPE_MODE_T
AC_TYPE_OFF_T
Expand Down Expand Up @@ -3967,17 +3927,6 @@ then
NetBSD*|DragonFly*)
LDSHARED='$(CC) -shared'
LDCXXSHARED='$(CXX) -shared';;
OpenUNIX*|UnixWare*)
if test "$ac_cv_gcc_compat" = "yes" ; then
LDSHARED='$(CC) -shared'
LDCXXSHARED='$(CXX) -shared'
else
LDSHARED='$(CC) -G'
LDCXXSHARED='$(CXX) -G'
fi;;
SCO_SV*)
LDSHARED='$(CC) -Wl,-G,-Bexport'
LDCXXSHARED='$(CXX) -Wl,-G,-Bexport';;
WASI*)
AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [
dnl not implemented yet
Expand Down Expand Up @@ -4025,16 +3974,6 @@ then
]);;
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";;
Haiku*) CCSHARED="-fPIC";;
OpenUNIX*|UnixWare*)
if test "$ac_cv_gcc_compat" = "yes"
then CCSHARED="-fPIC"
else CCSHARED="-KPIC"
fi;;
SCO_SV*)
if test "$ac_cv_gcc_compat" = "yes"
then CCSHARED="-fPIC"
else CCSHARED="-Kpic -belf"
fi;;
VxWorks*)
CCSHARED="-fpic -D__SO_PICABILINUX__ -ftls-model=global-dynamic"
esac
Expand Down Expand Up @@ -4085,9 +4024,6 @@ then
fi
fi
;;
OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
FreeBSD*|NetBSD*|OpenBSD*|DragonFly*)
if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
then
Expand Down Expand Up @@ -6364,8 +6300,7 @@ AS_VAR_IF([ac_cv_device_macros], [yes], [

dnl no longer used, now always defined for backwards compatibility
AC_DEFINE([SYS_SELECT_WITH_SYS_TIME], [1],
[Define if you can safely include both <sys/select.h> and <sys/time.h>
(which you can't on SCO ODT 3.0).])
[Define if you can safely include both <sys/select.h> and <sys/time.h>])

# On OSF/1 V5.1, getaddrinfo is available, but a define
# for [no]getaddrinfo in netdb.h.
Expand Down
8 changes: 1 addition & 7 deletions pyconfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -1922,8 +1922,7 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS

/* Define if you can safely include both <sys/select.h> and <sys/time.h>
(which you can't on SCO ODT 3.0). */
/* Define if you can safely include both <sys/select.h> and <sys/time.h> */
#undef SYS_SELECT_WITH_SYS_TIME

/* Custom thread stack size depending on chosen sanitizer runtimes. */
Expand Down Expand Up @@ -2233,10 +2232,5 @@
#undef uid_t


/* Define the macros needed if on a UnixWare 7.x system. */
#if defined(__USLC__) && defined(__SCO_VERSION__)
#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
#endif

#endif /*Py_PYCONFIG_H*/

Loading