diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-07 10:38:39 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-08 13:15:57 +0200 |
| commit | 293e2c2fa1c0cca21c941fd15033d3251dfa0711 (patch) | |
| tree | 8476518fd3b5d4f82f47b138a4dae759995a7c1b | |
| parent | 3fcc5534a40dbe9af99f5e2a84c9e56130cf0464 (diff) | |
| download | otp-293e2c2fa1c0cca21c941fd15033d3251dfa0711.tar.gz otp-293e2c2fa1c0cca21c941fd15033d3251dfa0711.tar.bz2 otp-293e2c2fa1c0cca21c941fd15033d3251dfa0711.zip | |
erts/configure.in: Remove broken support for System V
If we are compiling on System V, the symbols NO_WEAK_PRAGMA and
SOCKOPT_CONNECT_STAT are defined, but they are never used.
| -rw-r--r-- | erts/configure.in | 10 | ||||
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/erts/configure.in b/erts/configure.in index bea1e14859..77ea7a2471 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -907,16 +907,6 @@ fi AC_SUBST(ERLANG_OSTYPE) -dnl Which sysv4 would this be, and what is it for??? -dnl XXX: replace with feature tests. -case $host_os in - sysv4*) - AC_DEFINE(SOCKOPT_CONNECT_STAT,[],[Obscure SYSV feature]) - AC_DEFINE(NO_PRAGMA_WEAK,[],[Obscure SYSV feature]) - LIBS="$LIBS -lgen -lc -L /usr/ucblib -lucb" - ;; -esac - # Check how to export functions from the emulator executable, needed # when dynamically loaded drivers are loaded (so that they can find # emulator functions). diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index ebc4469a23..df1f19c482 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -9308,7 +9308,7 @@ static int tcp_inet_output(tcp_descriptor* desc, HANDLE event) goto done; } } -#endif /* SOCKOPT_CONNECT_STAT */ +#endif /* SO_ERROR */ #endif /* !__WIN32__ */ desc->inet.state = TCP_STATE_CONNECTED; @@ -10113,7 +10113,7 @@ static int packet_inet_output(udp_descriptor* udesc, HANDLE event) goto done; } } -#endif /* SOCKOPT_CONNECT_STAT */ +#endif /* SO_ERROR */ #endif /* !__WIN32__ */ desc->state = PACKET_STATE_CONNECTED; |