diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-02-22 15:49:16 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-02-22 15:49:16 +0000 |
| commit | d6a20a1e70a3334750e3d166461523d343a57dd7 (patch) | |
| tree | 7f31857b5bdfb598d8cd33b5062760a8409de9d7 | |
| parent | ccff0b02565287e40e5eb90024f4fc4141804477 (diff) | |
| download | xine-lib-d6a20a1e70a3334750e3d166461523d343a57dd7.tar.gz xine-lib-d6a20a1e70a3334750e3d166461523d343a57dd7.tar.bz2 | |
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.
CVS patchset: 8620
CVS date: 2007/02/22 15:49:16
| -rw-r--r-- | include/xine.h.in | 4 | ||||
| -rw-r--r-- | src/xine-engine/configfile.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/configfile.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index 986046081..858908b14 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.166 2007/02/20 00:43:06 dgp85 Exp $ + * $Id: xine.h.in,v 1.167 2007/02/22 15:49:16 dgp85 Exp $ * * public xine-lib (libxine) interface and documentation * @@ -1488,7 +1488,7 @@ int xine_config_register_range (xine_t *self, int xine_config_register_enum (xine_t *self, const char *key, int def_value, - const char **values, + char **values, const char *description, const char *help, int exp_level, diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index cdbcae4fb..28b44fd51 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.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: configfile.c,v 1.84 2007/02/20 00:01:19 dgp85 Exp $ + * $Id: configfile.c,v 1.85 2007/02/22 15:49:16 dgp85 Exp $ * * config object (was: file) management - implementation * @@ -717,7 +717,7 @@ static int config_parse_enum (const char *str, const char **values) { 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, diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h index 3fb1124b4..859214d1c 100644 --- a/src/xine-engine/configfile.h +++ b/src/xine-engine/configfile.h @@ -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: configfile.h,v 1.41 2007/02/20 00:01:19 dgp85 Exp $ + * $Id: configfile.h,v 1.42 2007/02/22 15:49:16 dgp85 Exp $ * * config file management * @@ -131,7 +131,7 @@ struct config_values_s { 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, |