Move cupsGetDevices to adminutil.h since it isn't a regular application API.

diff --git a/cups/Dependencies b/cups/Dependencies
index d990a0ca016ad37202f8d1ce462115cbf177abcb..4b3539d40b3ffafbfb86d85dc9d3a75eaa783711 100644 (file)
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -62,7 +62,7 @@ getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \
   debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \
   ipp-private.h ../cups/ipp.h http.h http-private.h ../cups/language.h \
   md5-private.h language-private.h ../cups/transcode.h pwg-private.h \
-  ../cups/cups.h file.h pwg.h thread-private.h
+  ../cups/cups.h file.h pwg.h thread-private.h adminutil.h
 getifaddrs.o: getifaddrs.c http-private.h ../config.h ../cups/language.h \
   array.h versioning.h ../cups/http.h md5-private.h ipp-private.h \
   ../cups/ipp.h

diff --git a/cups/adminutil.h b/cups/adminutil.h
index 8c0643143be738f7cfe91c18afa0e331e4b508ce..ea9d6a0e0af45d0bf353615136caceda7a3c845e 100644 (file)
--- a/cups/adminutil.h
+++ b/cups/adminutil.h
@@ -1,7 +1,7 @@
 /*
  * Administration utility API definitions for CUPS.
  *
- * Copyright 2007-2012 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
  * Copyright 2001-2007 by Easy Software Products.
  *
  * These coded instructions, statements, and computer programs are the
@@ -40,11 +40,23 @@ extern "C" {
 #  define CUPS_SERVER_DEBUG_LOGGING    "_debug_logging"
 #  define CUPS_SERVER_REMOTE_ADMIN     "_remote_admin"
 #  define CUPS_SERVER_REMOTE_ANY       "_remote_any"
-/*#  define CUPS_SERVER_REMOTE_PRINTERS        "_remote_printers"*/
 #  define CUPS_SERVER_SHARE_PRINTERS   "_share_printers"
 #  define CUPS_SERVER_USER_CANCEL_ANY  "_user_cancel_any"
 
 
+/*
+ * Types and structures...
+ */
+
+typedef void (*cups_device_cb_t)(const char *device_class,
+                                 const char *device_id, const char *device_info,
+                                 const char *device_make_and_model,
+                                 const char *device_uri,
+                                const char *device_location, void *user_data);
+                                       /* Device callback
+                                        * @since CUPS 1.4/OS X 10.6@ */
+
+
 /*
  * Functions...
  */
@@ -67,6 +79,12 @@ extern int   cupsAdminSetServerSettings(http_t *http,
                                           cups_option_t *settings)
                                           _CUPS_API_1_3;
 
+extern ipp_status_t    cupsGetDevices(http_t *http, int timeout,
+                                      const char *include_schemes,
+                                      const char *exclude_schemes,
+                                      cups_device_cb_t callback,
+                                      void *user_data) _CUPS_API_1_4;
+
 
 #  ifdef __cplusplus
 }

diff --git a/cups/cups.h b/cups/cups.h
index 50f954565c70bff1ba30b9ebf5527b459587d3e7..5a197fcb29e38709d0430906ff62201bd4c652ef 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -313,14 +313,6 @@ typedef int (^cups_dest_block_t)(unsigned flags, cups_dest_t *dest);
                                         * @since CUPS 1.6/OS X 10.8@ */
 #  endif /* __BLOCKS__ */
 
-typedef void (*cups_device_cb_t)(const char *device_class,
-                                 const char *device_id, const char *device_info,
-                                 const char *device_make_and_model,
-                                 const char *device_uri,
-                                const char *device_location, void *user_data);
-                                       /* Device callback
-                                        * @since CUPS 1.4/OS X 10.6@ */
-
 typedef const char *(*cups_password_cb_t)(const char *prompt);
                                        /* Password callback */
 
@@ -460,11 +452,6 @@ extern int         cupsCreateJob(http_t *http, const char *name,
                                      cups_option_t *options) _CUPS_API_1_4;
 extern ipp_status_t    cupsFinishDocument(http_t *http,
                                           const char *name) _CUPS_API_1_4;
-extern ipp_status_t    cupsGetDevices(http_t *http, int timeout,
-                                      const char *include_schemes,
-                                      const char *exclude_schemes,
-                                      cups_device_cb_t callback,
-                                      void *user_data) _CUPS_API_1_4;
 extern cups_dest_t     *cupsGetNamedDest(http_t *http, const char *name,
                                          const char *instance) _CUPS_API_1_4;
 extern const char      *cupsGetPassword2(const char *prompt, http_t *http,

diff --git a/cups/getdevices.c b/cups/getdevices.c
index c3e828785e427331535be8b37efe390a067dcf84..35df489a2a8588ff96ad9e5078dcf7f1fe598da3 100644 (file)
--- a/cups/getdevices.c
+++ b/cups/getdevices.c
@@ -1,7 +1,7 @@
 /*
  * cupsGetDevices implementation for CUPS.
  *
- * Copyright 2008-2013 by Apple Inc.
+ * Copyright 2008-2016 by Apple Inc.
  *
  * These coded instructions, statements, and computer programs are the
  * property of Apple Inc. and are protected by Federal copyright
@@ -17,6 +17,7 @@
  */
 
 #include "cups-private.h"
+#include "adminutil.h"
 
 
 /*

diff --git a/filter/Dependencies b/filter/Dependencies
index 7b8c4836e4c3fade41edb6539b6ae22c744cf4fa..80a49b606849efd3d37c483cdc4e2cedf96b6012 100644 (file)
--- a/filter/Dependencies
+++ b/filter/Dependencies
@@ -64,4 +64,5 @@ rastertopwg.o: rastertopwg.c ../cups/cups-private.h \
 testraster.o: testraster.c ../cups/raster-private.h ../cups/raster.h \
   ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \
   ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \
-  ../cups/debug-private.h ../cups/string-private.h ../config.h
+  ../cups/debug-private.h ../cups/string-private.h ../config.h \
+  ../cups/ppd.h

diff --git a/test/Dependencies b/test/Dependencies
index 322301a94cabeec006bd8f70885c0f4f68b11919..031b4113c50e3cf80a56d09151e6849a1c74e7b6 100644 (file)
--- a/test/Dependencies
+++ b/test/Dependencies
@@ -5,13 +5,6 @@ ippfind.o: ippfind.c ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h
-ippinfra.o: ippinfra.c ../config.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h ../cups/string-private.h \
-  ../cups/thread-private.h
-ippproxy.o: ippproxy.c ../cups/cups.h ../cups/file.h ../cups/versioning.h \
-  ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h \
-  ../cups/pwg.h
 ippserver.o: ippserver.c ../config.h ../cups/cups.h ../cups/file.h \
   ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
   ../cups/language.h ../cups/pwg.h ../cups/string-private.h \
@@ -23,6 +16,3 @@ ipptool.o: ipptool.c ../cups/cups-private.h ../cups/string-private.h \
   ../cups/md5-private.h ../cups/language-private.h ../cups/transcode.h \
   ../cups/pwg-private.h ../cups/cups.h ../cups/file.h ../cups/pwg.h \
   ../cups/thread-private.h ../cups/file-private.h
-xmltotest.o: xmltotest.c ../config.h ../cups/cups.h ../cups/file.h \
-  ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h