sys/pool*.h

4 files changed, 5 insertions, 58 deletions

diff --git a/libpool/debian/patches/libpool-avoid-sys-pooh.h.patch b/libpool/debian/patches/libpool-avoid-sys-pooh.h.patch
deleted file mode 100644
index a28b2f8..0000000
--- a/libpool/debian/patches/libpool-avoid-sys-pooh.h.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: libpool/usr/src/lib/libpool/common/pool.h
-===================================================================
---- libpool.orig/usr/src/lib/libpool/common/pool.h	2012-10-08 04:25:41.000000000 +0400
-+++ libpool/usr/src/lib/libpool/common/pool.h	2012-10-30 14:48:30.888654707 +0400
-@@ -39,7 +39,15 @@
- 
- #include <sys/procset.h>
- #include <sys/types.h>
--#include <sys/pool.h>
-+
-+#define POOL_DEFAULT        0       /* default pool's ID */
-+#define POOL_MAXID      999999      /* maximum possible pool ID */
-+#define POOL_INVALID        -1
-+
-+/* pools states */
-+#define POOL_DISABLED       0       /* pools enabled */
-+#define POOL_ENABLED        1       /* pools disabled */
-+
- 
- #ifdef	__cplusplus
- extern "C" {
-Index: libpool/usr/src/lib/libpool/common/pool.c
-===================================================================
---- libpool.orig/usr/src/lib/libpool/common/pool.c	2012-10-30 14:48:30.808955901 +0400
-+++ libpool/usr/src/lib/libpool/common/pool.c	2012-10-30 14:48:30.889983563 +0400
-@@ -47,7 +47,6 @@
- #define NOTE(s)
- #endif
- 
--#include <sys/pool.h>
- #include <sys/priocntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-Index: libpool/usr/src/lib/libpool/common/pool_internal.h
-===================================================================
---- libpool.orig/usr/src/lib/libpool/common/pool_internal.h	2012-10-30 14:48:30.809509621 +0400
-+++ libpool/usr/src/lib/libpool/common/pool_internal.h	2012-10-30 14:48:30.891582577 +0400
-@@ -30,7 +30,6 @@
- 
- #include <libnvpair.h>
- #include <stdarg.h>
--#include <sys/pool.h>
- #include <sys/pool_impl.h>
- 
- #ifdef	__cplusplus
-Index: libpool/usr/src/lib/libpool/common/pool_kernel.c
-===================================================================
---- libpool.orig/usr/src/lib/libpool/common/pool_kernel.c	2012-10-08 04:25:41.000000000 +0400
-+++ libpool/usr/src/lib/libpool/common/pool_kernel.c	2012-10-30 14:49:43.628248928 +0400
-@@ -45,7 +45,6 @@
- #include <libxml/tree.h>
- 
- #include <sys/mman.h>
--#include <sys/pool.h>
- #include <sys/pool_impl.h>
- #include <sys/priocntl.h>
- #include <sys/stat.h>
diff --git a/libpool/debian/patches/series b/libpool/debian/patches/series
index cd1e780..2e5dfba 100644
--- a/libpool/debian/patches/series
+++ b/libpool/debian/patches/series
@@ -1,4 +1,3 @@
 libpool-no-note.h.patch
 libpool-NULL-0.patch
 libpool-dtd-location.patch
-libpool-avoid-sys-pooh.h.patch
diff --git a/uts-headers/debian/changelog b/uts-headers/debian/changelog
index 1f78a86..8c0e442 100644
--- a/uts-headers/debian/changelog
+++ b/uts-headers/debian/changelog
@@ -8,6 +8,9 @@ uts-headers (2.10-2) UNRELEASED; urgency=low
     - usr/include/sys/exacct_catalog.h
     - usr/include/sys/exacct_impl.h
     - usr/include/sys/exacct.h
+    - usr/include/sys/pool_impl.h
+    - usr/include/sys/pool.h
+
 
   * Patched:  
     - sys/mnttab.h should include stdio.h if used
diff --git a/uts-headers/debian/unix-libc-dev.files b/uts-headers/debian/unix-libc-dev.files
index b2b8577..6be046d 100644
--- a/uts-headers/debian/unix-libc-dev.files
+++ b/uts-headers/debian/unix-libc-dev.files
@@ -245,6 +245,8 @@ usr/include/sys/pcb.h
 usr/include/sys/pci.h
 usr/include/sys/poll_impl.h
 usr/include/sys/poll.h
+usr/include/sys/pool_impl.h
+usr/include/sys/pool.h
 usr/include/sys/port_impl.h
 usr/include/sys/port_kernel.h
 usr/include/sys/port.h