diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-02-19 23:20:19 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-02-19 23:20:19 +0000 |
| commit | 7cb91f8dcbe3b01bfd3516b76ff62de3396f5e8d (patch) | |
| tree | 282baf76f6f40dc09292e339f0be726987233206 | |
| parent | f5525b1f3a0a257c8cd7e844144c19fa6f631c28 (diff) | |
| download | xine-lib-7cb91f8dcbe3b01bfd3516b76ff62de3396f5e8d.tar.gz xine-lib-7cb91f8dcbe3b01bfd3516b76ff62de3396f5e8d.tar.bz2 | |
Fix warning about incompatible pointer type.
CVS patchset: 8600
CVS date: 2007/02/19 23:20:19
| -rw-r--r-- | include/xine.h.in | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index 4c8a254c5..c776fe3fa 100644 --- a/include/xine.h.in +++ b/include/xine.h.in @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.h.in,v 1.164 2007/02/15 15:19:33 dgp85 Exp $ + * $Id: xine.h.in,v 1.165 2007/02/19 23:20:19 dgp85 Exp $ * * public xine-lib (libxine) interface and documentation * @@ -805,7 +805,7 @@ void xine_vlog(xine_t *self, int buf, #endif /* get log messages of specified section */ -const char *const *xine_get_log (xine_t *self, int buf) XINE_PROTECTED; +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); diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index f5583a52f..600169121 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.340 2006/12/22 16:38:15 klan Exp $ + * $Id: xine.c,v 1.341 2007/02/19 23:20:19 dgp85 Exp $ */ /* @@ -2003,7 +2003,7 @@ void xine_vlog(xine_t *this, int buf, const char *format, this->log_buffers[buf]->scratch_printf(this->log_buffers[buf], format, args); } -const char *const *xine_get_log (xine_t *this, int buf) { +char *const *xine_get_log (xine_t *this, int buf) { if(buf >= XINE_LOG_NUM) return NULL; |