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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kdeprint/cups/cupsdconf2
From:       Adam Pigg <adam () piggz ! co ! uk>
Date:       2005-11-30 19:59:24
Message-ID: 1133380764.293643.21760.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 484443 by piggz:

cups internals have changed in 1.2.  This works for me, and hopefully wont break anything.

 M  +8 -3      cups-util.c  


--- branches/KDE/3.5/kdelibs/kdeprint/cups/cupsdconf2/cups-util.c #484442:484443
@@ -440,11 +440,16 @@
 
  /*
   * See if we are accessing localhost...
+	the struct has changed in newer versions - PiggZ (adam@piggz.co.uk)
   */
-
-  if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
+	if (ntohl(*(int*)&http->_hostaddr.sin_addr) != 0x7f000001 &&
       strcasecmp(http->hostname, "localhost") != 0)
-    return (0);
+#else
+	if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
+      strcasecmp(http->hostname, "localhost") != 0)
+#endif
+   return (0);
 
  /*
   * Try opening a certificate file for this PID.  If that fails,
[prev in list] [next in list] [prev in thread] [next in thread]