diff options
Diffstat (limited to 'kppp')
-rw-r--r-- | kppp/configure.in.in | 4 | ||||
-rw-r--r-- | kppp/opener.cpp | 4 | ||||
-rw-r--r-- | kppp/pppstats.cpp | 2 | ||||
-rw-r--r-- | kppp/requester.cpp | 10 |
4 files changed, 4 insertions, 16 deletions
diff --git a/kppp/configure.in.in b/kppp/configure.in.in index 720680c2..84e66210 100644 --- a/kppp/configure.in.in +++ b/kppp/configure.in.in @@ -5,7 +5,7 @@ AC_MSG_CHECKING(if kppp's headers are installed) AC_LANG_SAVE AC_LANG_CPLUSPLUS AC_TRY_LINK([ -#if defined(__osf__) || defined(__svr4__) +#if defined(__svr4__) #define _POSIX_PII_SOCKET extern "C" int sethostname(char *name, int name_len); #endif @@ -40,7 +40,7 @@ AC_TRY_LINK([ #include <net/if_ppp.h> /* BSD, NeXT, etc. */ #endif - #else /* SunOS 4, AIX 4, OSF/1, etc. */ + #else /* SunOS 4, AIX 4, etc. */ #include <sys/stream.h> #include <net/ppp_str.h> #endif diff --git a/kppp/opener.cpp b/kppp/opener.cpp index 7628681b..091a9814 100644 --- a/kppp/opener.cpp +++ b/kppp/opener.cpp @@ -36,14 +36,12 @@ #include <config.h> -#if defined(__osf__) || defined(__svr4__) +#if defined(__svr4__) #define _POSIX_PII_SOCKET extern "C" int sethostname(char *name, int name_len); -#if !defined(__osf__) extern "C" int _Psendmsg(int, void*, int); extern "C" int _Precvmsg(int, void*, int); #endif -#endif #include "kpppconfig.h" diff --git a/kppp/pppstats.cpp b/kppp/pppstats.cpp index aedd63bf..0247fb58 100644 --- a/kppp/pppstats.cpp +++ b/kppp/pppstats.cpp @@ -94,7 +94,7 @@ #else /* STREAMS */ #include <sys/socket.h> - #include <sys/stropts.h> /* SVR4, Solaris 2, SunOS 4, OSF/1, etc. */ + #include <sys/stropts.h> /* SVR4, Solaris 2, SunOS 4, etc. */ #include <net/ppp_defs.h> #include <net/pppio.h> #include <net/if.h> diff --git a/kppp/requester.cpp b/kppp/requester.cpp index 016d72fa..04ddea22 100644 --- a/kppp/requester.cpp +++ b/kppp/requester.cpp @@ -26,11 +26,6 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef __osf__ -#define _XOPEN_SOURCE_EXTENDED 1 -#endif - - #include <unistd.h> #include <stdlib.h> #include <stdio.h> @@ -44,11 +39,6 @@ #include <errno.h> #include <string.h> -#ifdef __osf__ -#undef accept -extern "C" unsigned int alarm(unsigned int); -#endif - #ifdef _XPG4_2 extern "C" { ssize_t sendmsg(int, const struct msghdr *, int); |