diff options
| author | Timo Sirainen <cras@irssi.org> | 2000-05-09 11:42:42 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-05-09 11:42:42 +0000 |
| commit | 93d603215114093b92837df0604c5fe285cc04a6 (patch) | |
| tree | f128c498946922199a426d46574612b22c539f66 /src/core | |
| parent | 90ff30fcd01cd15323a6d2d5fd9797660021b475 (diff) | |
| download | irssi-93d603215114093b92837df0604c5fe285cc04a6.zip | |
- Compiling fixes
- GNOME version isn't anymore build here so you don't need all that GTK and
GNOME crap to compile irssi-text.
- Some fixes to compile with -ansi -pedantic
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@200 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/commands.c | 6 | ||||
| -rw-r--r-- | src/core/misc.c | 2 | ||||
| -rw-r--r-- | src/core/settings.h | 2 | ||||
| -rw-r--r-- | src/core/special-vars.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/commands.c b/src/core/commands.c index e7f2560a..8f02db89 100644 --- a/src/core/commands.c +++ b/src/core/commands.c @@ -310,7 +310,7 @@ char *cmd_get_callfuncs(const char *data, int *count, va_list *args) ret = g_strdup(data); for (tmp = cmdget_funcs; tmp != NULL; tmp = tmp->next) { - func = tmp->data; + func = (CMD_GET_FUNC) tmp->data; old = ret; ret = func(ret, count, args); @@ -361,12 +361,12 @@ char *cmd_get_params(const char *data, int count, ...) void cmd_get_add_func(CMD_GET_FUNC func) { - cmdget_funcs = g_slist_prepend(cmdget_funcs, func); + cmdget_funcs = g_slist_prepend(cmdget_funcs, (void *) func); } void cmd_get_remove_func(CMD_GET_FUNC func) { - cmdget_funcs = g_slist_prepend(cmdget_funcs, func); + cmdget_funcs = g_slist_prepend(cmdget_funcs, (void *) func); } static void parse_outgoing(const char *line, SERVER_REC *server, void *item) diff --git a/src/core/misc.c b/src/core/misc.c index 28aaae84..516c6dc3 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -377,7 +377,7 @@ int match_wildcards(const char *cmask, const char *data) char *mask, *newmask, *p1, *p2; int ret; - newmask = mask = strdup(cmask); + newmask = mask = g_strdup(cmask); for (; *mask != '\0' && *data != '\0'; mask++) { if (*mask == '?' || toupper(*mask) == toupper(*data)) { data++; diff --git a/src/core/settings.h b/src/core/settings.h index 9198bba9..81599db3 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -8,7 +8,7 @@ typedef struct _config_rec CONFIG_REC; enum { SETTING_TYPE_STRING, SETTING_TYPE_INT, - SETTING_TYPE_BOOLEAN, + SETTING_TYPE_BOOLEAN }; typedef struct { diff --git a/src/core/special-vars.c b/src/core/special-vars.c index 26788a65..7d51bca1 100644 --- a/src/core/special-vars.c +++ b/src/core/special-vars.c @@ -108,7 +108,7 @@ static char *get_long_variable_value(const char *key, void *server, void *item, *free_ret = FALSE; /* expando? */ - func = g_hash_table_lookup(expandos, key); + func = (EXPANDO_FUNC) g_hash_table_lookup(expandos, key); if (func != NULL) return func(server, item, free_ret); @@ -502,7 +502,7 @@ void expando_create(const char *key, EXPANDO_FUNC func) g_free(origkey); g_hash_table_remove(expandos, key); } - g_hash_table_insert(expandos, g_strdup(key), func); + g_hash_table_insert(expandos, g_strdup(key), (void *) func); } /* Destroy expando */ |