summaryrefslogtreecommitdiff
path: root/cups/http.h
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-01-19 16:53:50 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-01-19 16:53:50 +0000
commitdcb445bcf3e9ec2efd56550263052aca70beb08e (patch)
tree9a0d2260f2bbfdc8a6aa561c138baca1a58f8228 /cups/http.h
parent9c80ffa289171a48b10cbda2098289ed0c7b96cc (diff)
downloadcups-dcb445bcf3e9ec2efd56550263052aca70beb08e.tar.gz
Merge changes from CUPS 1.6svn-r10188, including changes for <rdar://problem/10127258> CUPS 1.6: New printer/printing APIs
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3618 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/http.h')
-rw-r--r--cups/http.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/cups/http.h b/cups/http.h
index a70e85cf5..fc83209d9 100644
--- a/cups/http.h
+++ b/cups/http.h
@@ -3,7 +3,7 @@
*
* Hyper-Text Transport Protocol definitions for CUPS.
*
- * Copyright 2007-2011 by Apple Inc.
+ * Copyright 2007-2012 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
@@ -463,8 +463,13 @@ extern void httpSetTimeout(http_t *http, double timeout,
_CUPS_API_1_5;
/**** New in CUPS 1.6 ****/
+extern http_addrlist_t *httpAddrConnect2(http_addrlist_t *addrlist, int *sock,
+ int msec, int *cancel)
+ _CUPS_API_1_6;
extern http_state_t httpGetState(http_t *http) _CUPS_API_1_6;
extern http_version_t httpGetVersion(http_t *http) _CUPS_API_1_6;
+extern int httpReconnect2(http_t *http, int msec, int *cancel)
+ _CUPS_API_1_6;
/*