[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kppp
From:       Pavel Heimlich <tropikhajma () gmail ! com>
Date:       2010-07-07 16:17:35
Message-ID: 20100707161735.8818DAC85D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1147199 by pavelheimlich:

early versions of gcc defined __svr4__, newer versions of gcc define __SVR4, which is \
consistent with Sun Studio compiler



 M  +2 -2      configure.in.in  
 M  +1 -1      devices.h  
 M  +1 -1      kpppconfig.h  
 M  +1 -1      modem.cpp  
 M  +2 -2      opener.cpp  
 M  +1 -1      opener.h  
 M  +1 -1      pppstats.cpp  


--- trunk/KDE/kdenetwork/kppp/configure.in.in #1147198:1147199
@@ -5,7 +5,7 @@
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 AC_TRY_LINK([
-#if defined(__osf__) || defined(__svr4__)
+#if defined(__osf__) || defined(__SVR4)
   #define _POSIX_PII_SOCKET
   extern "C" int sethostname(char *name, int name_len);
 #endif
@@ -18,7 +18,7 @@
 #endif
 #include <netinet/in.h>
 
-#ifdef __svr4__
+#ifdef __SVR4
   #include <sys/stropts.h>
   #include <net/pppio.h>		/* SVR4, Solaris 2, etc. */
 
--- trunk/KDE/kdenetwork/kppp/devices.h #1147198:1147199
@@ -88,7 +88,7 @@
   "/dev/ttySHSF1",
   "/dev/ttySHSF2",
   "/dev/ttySHSF3",  /* necessary for conexant modem which use hsfserial commercial \
                module */
-#elif defined(__svr4__)
+#elif defined(__SVR4)
   "/dev/cua/a",
   "/dev/cua/b",
   "/dev/ttya",
--- trunk/KDE/kdenetwork/kppp/kpppconfig.h #1147198:1147199
@@ -26,7 +26,7 @@
 #ifndef _KPPPCONFIG_H_
 #define _KPPPCONFIG_H_
 
-#if defined(__svr4__)
+#if defined(__SVR4)
 #define STREAMS
 #define _XOPEN_SOURCE 1
 #define _XOPEN_SOURCE_EXTENDED 1
--- trunk/KDE/kdenetwork/kppp/modem.cpp #1147198:1147199
@@ -374,7 +374,7 @@
       return false;
     }
 
-#ifndef __svr4__ // drops DTR but doesn't set it afterwards again. not good for \
init. +#ifndef __SVR4 // drops DTR but doesn't set it afterwards again. not good for \
init.  tcgetattr(modemfd, &temptty);
     cfsetospeed(&temptty, B0);
     cfsetispeed(&temptty, B0);
--- trunk/KDE/kdenetwork/kppp/opener.cpp #1147198:1147199
@@ -36,7 +36,7 @@
 #include <kdefakes.h>
 #include <config-kppp.h>
 
-#if defined(__osf__) || defined(__svr4__)
+#if defined(__osf__) || defined(__SVR4)
 #define _POSIX_PII_SOCKET
 extern "C" int sethostname(char *name, int name_len);
 #if !defined(__osf__)
@@ -654,7 +654,7 @@
 // I don't know if Linux needs more initialization to get the ioctl to
 // work, pppd seems to hint it does.  But BSD doesn't, and the following
 // code should compile.
-#if (defined(HAVE_NET_IF_PPP_H) || defined(HAVE_LINUX_IF_PPP_H)) && \
!defined(__svr4__) +#if (defined(HAVE_NET_IF_PPP_H) || defined(HAVE_LINUX_IF_PPP_H)) \
&& !defined(__SVR4)  int s, ok;
     struct ifreq ifr;
     //    extern char *no_ppp_msg;
--- trunk/KDE/kdenetwork/kppp/opener.h #1147198:1147199
@@ -13,7 +13,7 @@
 // ### add by bhughes - FreeBSD defines 'BSD' in sys/param.h
 #include <sys/param.h>
 
-#if defined(BSD) || defined(__svr4__)
+#if defined(BSD) || defined(__SVR4)
 # define IOV_BASE_CAST (char *)
 #else
 # define IOV_BASE_CAST (void *)
--- trunk/KDE/kdenetwork/kppp/pppstats.cpp #1147198:1147199
@@ -175,7 +175,7 @@
   bool is_up;
   struct ifreq ifr;
 
-#if defined(__svr4__ )
+#if defined(__SVR4)
   usleep(1000000); // Needed for Solaris ?!
 #endif
 


[prev in list] [next in list] [prev in thread] [next in thread]