Merge changes from CUPS 1.5svn-r9602.

[thirdparty/cups.git] / cups / cups-private.h

diff --git a/cups/cups-private.h b/cups/cups-private.h
index 87c396d81891363c8a735d2391bd9976b1bb559f..6e1677f8867a2bd7525784062aa5142e5940e5c0 100644 (file)
--- a/cups/cups-private.h
+++ b/cups/cups-private.h
@@ -1,9 +1,9 @@
 /*
- * "$Id$"
+ * "$Id: cups-private.h 9596 2011-03-11 18:26:36Z mike $"
  *
  *   Private definitions for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -31,6 +31,10 @@
 #  include "language-private.h"
 #  include "pwg-private.h"
 #  include "thread-private.h"
+#  ifdef __APPLE__
+#    include <sys/cdefs.h>
+#    include <CoreFoundation/CoreFoundation.h>
+#  endif /* __APPLE__ */
 
 
 /*
@@ -155,17 +159,32 @@ typedef struct _cups_globals_s            /**** CUPS global state data ****/
  * Prototypes...
  */
 
+#  ifdef __APPLE__
+extern CFStringRef     _cupsAppleCopyDefaultPaperID(void);
+extern CFStringRef     _cupsAppleCopyDefaultPrinter(void);
+extern int             _cupsAppleGetUseLastPrinter(void);
+extern void            _cupsAppleSetDefaultPaperID(CFStringRef name);
+extern void            _cupsAppleSetDefaultPrinter(CFStringRef name);
+extern void            _cupsAppleSetUseLastPrinter(int uselast);
+#  endif /* __APPLE__ */
+
 extern http_t          *_cupsConnect(void);
 extern int             _cupsGet1284Values(const char *device_id,
                                           cups_option_t **values);
+extern int             _cupsGetDests(http_t *http, ipp_op_t op,
+                                     const char *name, cups_dest_t **dests);
 extern const char      *_cupsGetPassword(const char *prompt);
 extern void            _cupsGlobalLock(void);
 extern _cups_globals_t *_cupsGlobals(void);
 extern void            _cupsGlobalUnlock(void);
+extern int             _cupsNextDelay(int current, int *previous);
 extern void            _cupsSetDefaults(void);
 extern void            _cupsSetError(ipp_status_t status, const char *message,
                                      int localize);
 extern void            _cupsSetHTTPError(http_status_t status);
+#  ifdef HAVE_GSSAPI
+extern int             _cupsSetNegotiateAuthString(http_t *http);
+#  endif /* HAVE_GSSAPI */
 extern char            *_cupsUserDefault(char *name, size_t namesize);
 
 
@@ -179,5 +198,5 @@ extern char         *_cupsUserDefault(char *name, size_t namesize);
 #endif /* !_CUPS_CUPS_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: cups-private.h 9596 2011-03-11 18:26:36Z mike $".
  */