diff options
Diffstat (limited to 'libsysevent/debian/patches/libsysevent-split-sys_sysevent.h.patch')
| -rw-r--r-- | libsysevent/debian/patches/libsysevent-split-sys_sysevent.h.patch | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/libsysevent/debian/patches/libsysevent-split-sys_sysevent.h.patch b/libsysevent/debian/patches/libsysevent-split-sys_sysevent.h.patch index cfad874..617675b 100644 --- a/libsysevent/debian/patches/libsysevent-split-sys_sysevent.h.patch +++ b/libsysevent/debian/patches/libsysevent-split-sys_sysevent.h.patch @@ -3,8 +3,8 @@ Description: all this stuff is in sys/sysevent_defs.h Index: libsysevent/usr/src/uts/common/sys/sysevent.h =================================================================== --- libsysevent.orig/usr/src/uts/common/sys/sysevent.h 2012-10-08 00:26:00.000000000 +0000 -+++ libsysevent/usr/src/uts/common/sys/sysevent.h 2012-11-08 00:22:53.279544955 +0000 -@@ -26,193 +26,7 @@ ++++ libsysevent/usr/src/uts/common/sys/sysevent.h 2012-11-08 00:29:31.309637067 +0000 +@@ -26,193 +26,8 @@ #ifndef _SYS_SYSEVENT_H #define _SYS_SYSEVENT_H @@ -196,6 +196,52 @@ Index: libsysevent/usr/src/uts/common/sys/sysevent.h -#define EVCH_SET_CHAN_LEN 3 /* Set event queue length */ -#define EVCH_CMD_LAST EVCH_SET_CHAN_LEN /* Last command */ +#include <sys/sysevent_defs.h> ++#include <door.h> /* * Shared user/kernel event channel interface definitions +@@ -228,13 +43,6 @@ + extern int sysevent_evc_setpropnvl(evchan_t *, nvlist_t *); + extern int sysevent_evc_getpropnvl(evchan_t *, nvlist_t **); + +-#ifndef _KERNEL +- +-/* +- * Userland-only event channel interfaces +- */ +- +-#include <door.h> + + typedef struct sysevent_subattr sysevent_subattr_t; + +@@ -252,30 +60,6 @@ + extern int sysevent_evc_xsubscribe(evchan_t *, const char *, const char *, + int (*)(sysevent_t *, void *), void *, uint32_t, sysevent_subattr_t *); + +-#else +- +-/* +- * Kernel log_event interfaces. +- */ +-extern int log_sysevent(sysevent_t *, int, sysevent_id_t *); +- +-extern sysevent_t *sysevent_alloc(char *, char *, char *, int); +-extern void sysevent_free(sysevent_t *); +-extern int sysevent_add_attr(sysevent_attr_list_t **, char *, +- sysevent_value_t *, int); +-extern void sysevent_free_attr(sysevent_attr_list_t *); +-extern int sysevent_attach_attributes(sysevent_t *, sysevent_attr_list_t *); +-extern void sysevent_detach_attributes(sysevent_t *); +-extern char *sysevent_get_class_name(sysevent_t *); +-extern char *sysevent_get_subclass_name(sysevent_t *); +-extern uint64_t sysevent_get_seq(sysevent_t *); +-extern void sysevent_get_time(sysevent_t *, hrtime_t *); +-extern size_t sysevent_get_size(sysevent_t *); +-extern char *sysevent_get_pub(sysevent_t *); +-extern int sysevent_get_attr_list(sysevent_t *, nvlist_t **); +- +-#endif /* _KERNEL */ +- + #ifdef __cplusplus + } + #endif |