Mercurial > pidgin.yaz
changeset 15034:b28f5caf9445
[gaim-migrate @ 17816]
This fixes gnt builds for me (avoiding multiple-definition errors when linking) by marking some declarations as extern in the gntkeys.h and actually defining them in gntkeys.c
committer: Tailor Script <tailor@pidgin.im>
| author | Christopher O'Brien <siege@pidgin.im> |
|---|---|
| date | Thu, 23 Nov 2006 15:22:53 +0000 |
| parents | ca46f41aa433 |
| children | 8c5c4d7d53a5 |
| files | console/libgnt/gntkeys.c console/libgnt/gntkeys.h |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/console/libgnt/gntkeys.c Thu Nov 23 08:37:07 2006 +0000 +++ b/console/libgnt/gntkeys.c Thu Nov 23 15:22:53 2006 +0000 @@ -3,6 +3,12 @@ #include <stdlib.h> #include <string.h> +char *gnt_key_cup; +char *gnt_key_cdown; +char *gnt_key_cleft; +char *gnt_key_cright; + + static const char *term; void gnt_init_keys()
--- a/console/libgnt/gntkeys.h Thu Nov 23 08:37:07 2006 +0000 +++ b/console/libgnt/gntkeys.h Thu Nov 23 15:22:53 2006 +0000 @@ -9,10 +9,10 @@ * ctrl-up, ctrl-down etc. So I am going to hard-code some of the information * for some popular $TERMs */ -char *gnt_key_cup; -char *gnt_key_cdown; -char *gnt_key_cleft; -char *gnt_key_cright; +extern char *gnt_key_cup; +extern char *gnt_key_cdown; +extern char *gnt_key_cleft; +extern char *gnt_key_cright; #define SAFE(x) ((x) ? (x) : "")