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 /src/xine-engine/configfile.c | |
| 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
Diffstat (limited to 'src/xine-engine/configfile.c')
| -rw-r--r-- | src/xine-engine/configfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
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, |