diff options
| -rw-r--r-- | configure.in.in | 32 | ||||
| -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 | ||||
| -rw-r--r-- | krfb/krfb/rfbcontroller.cpp | 4 | ||||
| -rw-r--r-- | ktalkd/mail.local/mail.local.c | 4 | ||||
| -rw-r--r-- | lanbrowsing/lisa/netscanner.cpp | 10 |
8 files changed, 4 insertions, 66 deletions
diff --git a/configure.in.in b/configure.in.in index 4cb96bc1..ea39d9f3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -99,35 +99,3 @@ if test -z "$LIBPTHREAD" && test -z "$USE_THREADS"; then DO_NOT_COMPILE="$DO_NOT_COMPILE kdict krfb krdc" fi CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" - -AH_VERBATIM(_osf_config_h, -[ -#ifdef __osf__ -/* From Tom Leitner */ -#if __STDC__ -#include <stdarg.h> -#include <stdlib.h> -#else -#include <varargs.h> -#endif -#ifndef __OSF_INCLUDED__ -#define __OSF_INCLUDED__ -#define MSG_NOSIGNAL 0 -#ifndef AF_LOCAL -#define AF_LOCAL 1 /* is the same as AF_UNIX */ -#endif -#ifndef herror -#define herror(a) printf(a) -#endif - -#include <sys/types.h> -#ifdef __cplusplus -extern "C" int sethostname (char *name, int name_len ); -extern "C" int flock(int filedes, int operation ); -#else -int sethostname (char *name, int name_len ); -int flock(int filedes, int operation ); -#endif -#endif -#endif -]) 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); diff --git a/krfb/krfb/rfbcontroller.cpp b/krfb/krfb/rfbcontroller.cpp index 9abe8c5f..45f2d435 100644 --- a/krfb/krfb/rfbcontroller.cpp +++ b/krfb/krfb/rfbcontroller.cpp @@ -933,10 +933,6 @@ void RFBController::sendSessionEstablished() emit sessionEstablished(remoteIp); } -#ifdef __osf__ -extern "C" Bool XShmQueryExtension(Display*); -#endif - bool RFBController::checkX11Capabilities() { int bp1, bp2, majorv, minorv; Bool r = XTestQueryExtension(tqt_xdisplay(), &bp1, &bp2, diff --git a/ktalkd/mail.local/mail.local.c b/ktalkd/mail.local/mail.local.c index fbf91957..007c46b8 100644 --- a/ktalkd/mail.local/mail.local.c +++ b/ktalkd/mail.local/mail.local.c @@ -181,10 +181,6 @@ static char copyright[] = #define USE_VSYSLOG 0 #endif -#if defined(__osf__) - #define USE_VSYSLOG 0 -#endif - #if defined(NeXT) #include <libc.h> #define _PATH_MAILDIR "/usr/spool/mail" diff --git a/lanbrowsing/lisa/netscanner.cpp b/lanbrowsing/lisa/netscanner.cpp index acf0515c..232b4f2b 100644 --- a/lanbrowsing/lisa/netscanner.cpp +++ b/lanbrowsing/lisa/netscanner.cpp @@ -38,16 +38,6 @@ #include <stdio.h> #include <sys/socket.h> #include <sys/types.h> -#ifdef __osf__ -#undef BYTE_ORDER -#define _OSF_SOURCE -#undef _MACHINE_ENDIAN_H_ -#undef __STDC__ -#define __STDC__ 0 -#include <netinet/ip.h> -#undef __STDC__ -#define __STDC__ 1 -#endif #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> |