[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1949: add ippReadIO and ippWriteIO (bug 3087)

[Mats Wichmann]

------------------------------------------------------------
revno: 1949
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Mon 2012-05-07 06:13:17 -0600
message:
  add ippReadIO and ippWriteIO (bug 3087)
modified:
  headers/All/5.0/cups/ipp.h.defs
  headers/cups/ipp.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/cups/ipp.h.defs'
--- a/headers/All/5.0/cups/ipp.h.defs	2010-10-01 12:40:20 +0000
+++ b/headers/All/5.0/cups/ipp.h.defs	2012-05-07 12:13:17 +0000
@@ -213,6 +213,7 @@
     CUPS_GET_PPD
 } ipp_op_t;
 typedef unsigned char ipp_uchar_t;
+typedef ssize_t(*ipp_iocb_t) (void *, ipp_uchar_t *, size_t);
 typedef union ipp_request_u {
     struct {
 	ipp_uchar_t version[2];
@@ -328,7 +329,11 @@
 extern int ippPort(void);
 extern ipp_state_t ippRead(http_t * http, ipp_t * ipp);
 extern ipp_state_t ippReadFile(int fd, ipp_t * ipp);
+extern ipp_state_t ippReadIO(void *src, ipp_iocb_t cb, int blocking,
+			     ipp_t * parent, ipp_t * ipp);
 extern void ippSetPort(int p);
 extern const ipp_uchar_t *ippTimeToDate(time_t t);
 extern ipp_state_t ippWrite(http_t * http, ipp_t * ipp);
 extern ipp_state_t ippWriteFile(int fd, ipp_t * ipp);
+extern ipp_state_t ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
+			      ipp_t * parent, ipp_t * ipp);

=== modified file 'headers/cups/ipp.h'
--- a/headers/cups/ipp.h	2010-10-01 12:40:20 +0000
+++ b/headers/cups/ipp.h	2012-05-07 12:13:17 +0000
@@ -5,6 +5,7 @@
 #include <sys/types.h>
 #include <stddef.h>
 #include <netinet/in.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -245,6 +246,11 @@
 
     typedef struct ipp_attribute_s ipp_attribute_t;
 
+#if __LSB_VERSION__ >= 50
+    typedef ssize_t(*ipp_iocb_t) (void *, ipp_uchar_t *, size_t);
+
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
     union ipp_request_u {
 	struct {
 	    ipp_uchar_t version[2];
@@ -382,6 +388,13 @@
     extern const ipp_uchar_t *ippTimeToDate(time_t t);
     extern ipp_state_t ippWrite(http_t * http, ipp_t * ipp);
     extern ipp_state_t ippWriteFile(int fd, ipp_t * ipp);
+#if __LSB_VERSION__ >= 50
+    extern ipp_state_t ippReadIO(void *src, ipp_iocb_t cb, int blocking,
+				 ipp_t * parent, ipp_t * ipp);
+    extern ipp_state_t ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
+				  ipp_t * parent, ipp_t * ipp);
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-07 11:52:06 +0000
+++ b/package/Makefile	2012-05-07 12:13:17 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=6
+RPM_PACKAGE_RELEASE=7
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)