Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14870/src/xine-engine
Modified Files:
configfile.c configfile.h
Log Message:
Revert the const mark on xine_config_register_enum, as that breaks C++
frontends (like Kaffeine). Thanks to Christoph Pfister for reporting. This
change introduces a few warnings of incompatible pointers internally in
configfile.c. These are non-fatal (in C) and they just tell the compiler to
handle more stuff as const internally without changing the function interface.
Index: configfile.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/configfile.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- configfile.c 20 Feb 2007 00:01:19 -0000 1.84
+++ configfile.c 22 Feb 2007 15:49:16 -0000 1.85
@@ -717,7 +717,7 @@
static int config_register_enum (config_values_t *this,
const char *key,
int def_value,
- const char **values,
+ char **values,
const char *description,
const char *help,
int exp_level,
Index: configfile.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/configfile.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- configfile.h 20 Feb 2007 00:01:19 -0000 1.41
+++ configfile.h 22 Feb 2007 15:49:16 -0000 1.42
@@ -131,7 +131,7 @@
int (*register_enum) (config_values_t *self,
const char *key,
int def_value,
- const char **values,
+ char **values,
const char *description,
const char *help,
int exp_level,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
