summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cups/Dependencies181
-rw-r--r--cups/getifaddrs-internal.h113
-rw-r--r--cups/getifaddrs.c4
-rw-r--r--cups/http-private.h42
-rw-r--r--scheduler/Dependencies3
-rw-r--r--scheduler/network.c3
-rw-r--r--systemv/Dependencies14
7 files changed, 212 insertions, 148 deletions
diff --git a/cups/Dependencies b/cups/Dependencies
index 7f71eaa25..b30c76994 100644
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -1,9 +1,3 @@
-adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h ppd.h cups.h raster.h adminutil.h
array.o: array.c ../cups/cups.h file.h versioning.h ipp.h http.h array.h \
language.h pwg.h string-private.h ../config.h ../cups/versioning.h \
debug-internal.h debug-private.h array-private.h ../cups/array.h
@@ -13,14 +7,6 @@ auth.o: auth.c cups-private.h string-private.h ../config.h \
pwg.h http-private.h ../cups/language.h ../cups/http.h \
language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
debug-internal.h debug-private.h
-backchannel.o: backchannel.c cups.h file.h versioning.h ipp.h http.h \
- array.h language.h pwg.h
-backend.o: backend.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- backend.h ppd.h cups.h raster.h
debug.o: debug.c cups-private.h string-private.h ../config.h \
../cups/versioning.h array-private.h ../cups/array.h versioning.h \
ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
@@ -65,15 +51,6 @@ file.o: file.c file-private.h cups-private.h string-private.h ../config.h \
pwg.h http-private.h ../cups/language.h ../cups/http.h \
language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
debug-internal.h debug-private.h
-getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h adminutil.h cups.h
-getifaddrs.o: getifaddrs.c http-private.h ../config.h ../cups/language.h \
- array.h versioning.h ../cups/http.h ipp-private.h ../cups/cups.h \
- file.h ipp.h http.h language.h pwg.h
getputfile.o: getputfile.c cups-private.h string-private.h ../config.h \
../cups/versioning.h array-private.h ../cups/array.h versioning.h \
ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
@@ -161,6 +138,96 @@ options.o: options.c cups-private.h string-private.h ../config.h \
pwg.h http-private.h ../cups/language.h ../cups/http.h \
language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
debug-internal.h debug-private.h
+pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h
+raster-error.o: raster-error.c cups-private.h string-private.h \
+ ../config.h ../cups/versioning.h array-private.h ../cups/array.h \
+ versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \
+ language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ raster-private.h raster.h cups.h ../cups/debug-private.h \
+ ../cups/string-private.h debug-internal.h debug-private.h
+raster-stream.o: raster-stream.c raster-private.h raster.h cups.h file.h \
+ versioning.h ipp.h http.h array.h language.h pwg.h ../cups/cups.h \
+ ../cups/debug-private.h ../cups/versioning.h ../cups/string-private.h \
+ ../config.h debug-internal.h debug-private.h
+raster-stubs.o: raster-stubs.c raster-private.h raster.h cups.h file.h \
+ versioning.h ipp.h http.h array.h language.h pwg.h ../cups/cups.h \
+ ../cups/debug-private.h ../cups/versioning.h ../cups/string-private.h \
+ ../config.h
+request.o: request.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h
+snprintf.o: snprintf.c string-private.h ../config.h ../cups/versioning.h
+string.o: string.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h
+tempfile.o: tempfile.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h
+thread.o: thread.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h
+tls.o: tls.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h tls-darwin.c
+transcode.o: transcode.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h
+usersys.o: usersys.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h
+util.o: util.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h
+adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h ppd.h cups.h raster.h adminutil.h
+backchannel.o: backchannel.c cups.h file.h versioning.h ipp.h http.h \
+ array.h language.h pwg.h
+backend.o: backend.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ backend.h ppd.h cups.h raster.h
+getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \
+ ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
+ ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
+ pwg.h http-private.h ../cups/language.h ../cups/http.h \
+ language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
+ debug-internal.h debug-private.h adminutil.h cups.h
+getifaddrs.o: getifaddrs.c getifaddrs-internal.h ../config.h
ppd.o: ppd.c cups-private.h string-private.h ../config.h \
../cups/versioning.h array-private.h ../cups/array.h versioning.h \
ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
@@ -226,34 +293,14 @@ ppd-util.o: ppd-util.c cups-private.h string-private.h ../config.h \
language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \
debug-private.h
-pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h
-raster-error.o: raster-error.c cups-private.h string-private.h \
- ../config.h ../cups/versioning.h array-private.h ../cups/array.h \
- versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \
- language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- raster-private.h raster.h cups.h ../cups/debug-private.h \
- ../cups/string-private.h debug-internal.h debug-private.h
raster-interpret.o: raster-interpret.c ../cups/raster-private.h raster.h \
cups.h file.h versioning.h ipp.h http.h array.h language.h pwg.h \
../cups/cups.h ../cups/debug-private.h ../cups/versioning.h \
../cups/string-private.h ../config.h ../cups/ppd-private.h \
../cups/ppd.h pwg-private.h debug-internal.h debug-private.h
-raster-stream.o: raster-stream.c raster-private.h raster.h cups.h file.h \
- versioning.h ipp.h http.h array.h language.h pwg.h ../cups/cups.h \
- ../cups/debug-private.h ../cups/versioning.h ../cups/string-private.h \
- ../config.h debug-internal.h debug-private.h
-request.o: request.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h
+raster-interstub.o: raster-interstub.c ../cups/ppd-private.h \
+ ../cups/cups.h file.h versioning.h ipp.h http.h array.h language.h \
+ pwg.h ../cups/ppd.h cups.h raster.h pwg-private.h
sidechannel.o: sidechannel.c sidechannel.h versioning.h cups-private.h \
string-private.h ../config.h ../cups/versioning.h array-private.h \
../cups/array.h ipp-private.h ../cups/cups.h file.h ipp.h http.h \
@@ -266,48 +313,6 @@ snmp.o: snmp.c cups-private.h string-private.h ../config.h \
pwg.h http-private.h ../cups/language.h ../cups/http.h \
language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
snmp-private.h debug-internal.h debug-private.h
-snprintf.o: snprintf.c string-private.h ../config.h ../cups/versioning.h
-string.o: string.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h
-tempfile.o: tempfile.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h
-thread.o: thread.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h
-tls.o: tls.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h tls-darwin.c
-transcode.o: transcode.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h
-usersys.o: usersys.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h
-util.o: util.c cups-private.h string-private.h ../config.h \
- ../cups/versioning.h array-private.h ../cups/array.h versioning.h \
- ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \
- pwg.h http-private.h ../cups/language.h ../cups/http.h \
- language-private.h ../cups/transcode.h pwg-private.h thread-private.h \
- debug-internal.h debug-private.h
raster-interstub.o: raster-interstub.c ../cups/ppd-private.h \
../cups/cups.h file.h versioning.h ipp.h http.h array.h language.h \
pwg.h ../cups/ppd.h cups.h raster.h pwg-private.h
diff --git a/cups/getifaddrs-internal.h b/cups/getifaddrs-internal.h
new file mode 100644
index 000000000..35e98be77
--- /dev/null
+++ b/cups/getifaddrs-internal.h
@@ -0,0 +1,113 @@
+/*
+ * getifaddrs definitions for CUPS.
+ *
+ * Copyright 2007-2018 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *
+ * Licensed under Apache License v2.0. See the file "LICENSE" for more
+ * information.
+ */
+
+#ifndef _CUPS_GETIFADDRS_INTERNAL_H_
+# define _CUPS_GETIFADDRS_INTERNAL_H_
+
+/*
+ * Include necessary headers...
+ */
+
+# include "config.h"
+# ifdef _WIN32
+# define _WINSOCK_DEPRECATED_NO_WARNINGS 1
+# include <io.h>
+# include <winsock2.h>
+# define CUPS_SOCAST (const char *)
+# else
+# include <unistd.h>
+# include <fcntl.h>
+# include <sys/socket.h>
+# define CUPS_SOCAST
+# endif /* _WIN32 */
+
+# if defined(__APPLE__) && !defined(_SOCKLEN_T)
+/*
+ * macOS 10.2.x does not define socklen_t, and in fact uses an int instead of
+ * unsigned type for length values...
+ */
+
+typedef int socklen_t;
+# endif /* __APPLE__ && !_SOCKLEN_T */
+
+# ifndef _WIN32
+# include <net/if.h>
+# include <resolv.h>
+# ifdef HAVE_GETIFADDRS
+# include <ifaddrs.h>
+# else
+# include <sys/ioctl.h>
+# ifdef HAVE_SYS_SOCKIO_H
+# include <sys/sockio.h>
+# endif /* HAVE_SYS_SOCKIO_H */
+# endif /* HAVE_GETIFADDRS */
+# endif /* !_WIN32 */
+
+
+/*
+ * C++ magic...
+ */
+
+# ifdef __cplusplus
+extern "C" {
+# endif /* __cplusplus */
+
+
+/*
+ * Some OS's don't have getifaddrs() and freeifaddrs()...
+ */
+
+# if !defined(_WIN32) && !defined(HAVE_GETIFADDRS)
+# ifdef ifa_dstaddr
+# undef ifa_dstaddr
+# endif /* ifa_dstaddr */
+# ifndef ifr_netmask
+# define ifr_netmask ifr_addr
+# endif /* !ifr_netmask */
+
+struct ifaddrs /**** Interface Structure ****/
+{
+ struct ifaddrs *ifa_next; /* Next interface in list */
+ char *ifa_name; /* Name of interface */
+ unsigned int ifa_flags; /* Flags (up, point-to-point, etc.) */
+ struct sockaddr *ifa_addr, /* Network address */
+ *ifa_netmask; /* Address mask */
+ union
+ {
+ struct sockaddr *ifu_broadaddr; /* Broadcast address of this interface. */
+ struct sockaddr *ifu_dstaddr; /* Point-to-point destination address. */
+ } ifa_ifu;
+
+ void *ifa_data; /* Interface statistics */
+};
+
+# ifndef ifa_broadaddr
+# define ifa_broadaddr ifa_ifu.ifu_broadaddr
+# endif /* !ifa_broadaddr */
+# ifndef ifa_dstaddr
+# define ifa_dstaddr ifa_ifu.ifu_dstaddr
+# endif /* !ifa_dstaddr */
+
+extern int _cups_getifaddrs(struct ifaddrs **addrs) _CUPS_PRIVATE;
+# define getifaddrs _cups_getifaddrs
+extern void _cups_freeifaddrs(struct ifaddrs *addrs) _CUPS_PRIVATE;
+# define freeifaddrs _cups_freeifaddrs
+# endif /* !_WIN32 && !HAVE_GETIFADDRS */
+
+
+/*
+ * C++ magic...
+ */
+
+# ifdef __cplusplus
+}
+# endif /* __cplusplus */
+
+#endif /* !_CUPS_GETIFADDRS_INTERNAL_H_ */
diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c
index 4e8ed8fb3..f751aa858 100644
--- a/cups/getifaddrs.c
+++ b/cups/getifaddrs.c
@@ -1,7 +1,7 @@
/*
* Network interface functions for CUPS.
*
- * Copyright © 2007-2010 by Apple Inc.
+ * Copyright © 2007-2018 by Apple Inc.
* Copyright © 1997-2006 by Easy Software Products, all rights reserved.
*
* Licensed under Apache License v2.0. See the file "LICENSE" for more
@@ -12,7 +12,7 @@
* Include necessary headers.
*/
-#include "http-private.h"
+#include "getifaddrs-internal.h"
#ifndef HAVE_GETIFADDRS
diff --git a/cups/http-private.h b/cups/http-private.h
index cfcabd304..9a789cf74 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -332,48 +332,6 @@ extern const char *_cups_hstrerror(int error);
/*
- * Some OS's don't have getifaddrs() and freeifaddrs()...
- */
-
-# if !defined(_WIN32) && !defined(HAVE_GETIFADDRS)
-# ifdef ifa_dstaddr
-# undef ifa_dstaddr
-# endif /* ifa_dstaddr */
-# ifndef ifr_netmask
-# define ifr_netmask ifr_addr
-# endif /* !ifr_netmask */
-
-struct ifaddrs /**** Interface Structure ****/
-{
- struct ifaddrs *ifa_next; /* Next interface in list */
- char *ifa_name; /* Name of interface */
- unsigned int ifa_flags; /* Flags (up, point-to-point, etc.) */
- struct sockaddr *ifa_addr, /* Network address */
- *ifa_netmask; /* Address mask */
- union
- {
- struct sockaddr *ifu_broadaddr; /* Broadcast address of this interface. */
- struct sockaddr *ifu_dstaddr; /* Point-to-point destination address. */
- } ifa_ifu;
-
- void *ifa_data; /* Interface statistics */
-};
-
-# ifndef ifa_broadaddr
-# define ifa_broadaddr ifa_ifu.ifu_broadaddr
-# endif /* !ifa_broadaddr */
-# ifndef ifa_dstaddr
-# define ifa_dstaddr ifa_ifu.ifu_dstaddr
-# endif /* !ifa_dstaddr */
-
-extern int _cups_getifaddrs(struct ifaddrs **addrs) _CUPS_PRIVATE;
-# define getifaddrs _cups_getifaddrs
-extern void _cups_freeifaddrs(struct ifaddrs *addrs) _CUPS_PRIVATE;
-# define freeifaddrs _cups_freeifaddrs
-# endif /* !_WIN32 && !HAVE_GETIFADDRS */
-
-
-/*
* Prototypes...
*/
diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index a6476c4f0..519ecda61 100644
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -149,7 +149,8 @@ network.o: network.c ../cups/http-private.h ../config.h \
../cups/pwg-private.h ../cups/thread-private.h ../cups/file-private.h \
../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \
statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \
- colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h
+ colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h \
+ ../cups/getifaddrs-internal.h
policy.o: policy.c cupsd.h ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
diff --git a/scheduler/network.c b/scheduler/network.c
index f935f648d..5ba00a1fb 100644
--- a/scheduler/network.c
+++ b/scheduler/network.c
@@ -1,7 +1,7 @@
/*
* Network interface functions for the CUPS scheduler.
*
- * Copyright © 2007-2014 by Apple Inc.
+ * Copyright © 2007-2018 by Apple Inc.
* Copyright © 1997-2006 by Easy Software Products, all rights reserved.
*
* Licensed under Apache License v2.0. See the file "LICENSE" for more
@@ -14,6 +14,7 @@
#include <cups/http-private.h>
#include "cupsd.h"
+#include <cups/getifaddrs-internal.h>
/*
diff --git a/systemv/Dependencies b/systemv/Dependencies
index 6d7a4d96f..1971cdf09 100644
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -11,26 +11,12 @@ cupsaccept.o: cupsaccept.c ../cups/cups-private.h \
../cups/language.h ../cups/pwg.h ../cups/http-private.h \
../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
../cups/thread-private.h
-cupsaddsmb.o: cupsaddsmb.c ../cups/cups-private.h \
- ../cups/string-private.h ../config.h ../cups/versioning.h \
- ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
- ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
- ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/thread-private.h ../cups/adminutil.h
cupsctl.o: cupsctl.c ../cups/cups-private.h ../cups/string-private.h \
../config.h ../cups/versioning.h ../cups/array-private.h \
../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \
../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/pwg.h \
../cups/http-private.h ../cups/language-private.h ../cups/transcode.h \
../cups/pwg-private.h ../cups/thread-private.h ../cups/adminutil.h
-cupstestdsc.o: cupstestdsc.c ../cups/cups-private.h \
- ../cups/string-private.h ../config.h ../cups/versioning.h \
- ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
- ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
- ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
- ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
- ../cups/thread-private.h
cupstestppd.o: cupstestppd.c ../cups/cups-private.h \
../cups/string-private.h ../config.h ../cups/versioning.h \
../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \