summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-06-12 02:33:43 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-06-12 02:33:43 +0100
commitc98a025193cd6aa8c8c8cc1cf3404b5f7b9251e1 (patch)
tree36476aac55d5037a8d2f49497c67e593a1be1e19 /include
parent3b80ae534dbba2eb355d1ede99e92b5431a7e3aa (diff)
parentecd1d68fa6221278496fedef976acf72888de6e0 (diff)
downloadxine-lib-c98a025193cd6aa8c8c8cc1cf3404b5f7b9251e1.tar.gz
xine-lib-c98a025193cd6aa8c8c8cc1cf3404b5f7b9251e1.tar.bz2
Merge from 1.1.
--HG-- rename : include/xine.h.in => include/xine.h
Diffstat (limited to 'include')
-rw-r--r--include/xine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xine.h b/include/xine.h
index 9df9fceae..f3c79a7b4 100644
--- a/include/xine.h
+++ b/include/xine.h
@@ -805,7 +805,7 @@ char *const *xine_get_log (xine_t *self, int buf) XINE_PROTECTED;
/* log callback will be called whenever something is logged */
typedef void (*xine_log_cb_t) (void *user_data, int section);
void xine_register_log_cb (xine_t *self, xine_log_cb_t cb,
- void *user_data) XINE_PROTECTED XINE_DEPRECATED;
+ void *user_data) XINE_PROTECTED;
/*
* error handling / engine status