[Gaim-commits] SF.net SVN: gaim: [17816] trunk/console/libgnt

[<tal...@us...>]

Revision: 17816
          http://svn.sourceforge.net/gaim/?rev=17816&view=rev
Author:   taliesein
Date:     2006-11-23 07:22:53 -0800 (Thu, 23 Nov 2006)

Log Message:
-----------
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

Modified Paths:
--------------
    trunk/console/libgnt/gntkeys.c
    trunk/console/libgnt/gntkeys.h

Modified: trunk/console/libgnt/gntkeys.c
===================================================================
--- trunk/console/libgnt/gntkeys.c	2006-11-23 08:37:07 UTC (rev 17815)
+++ trunk/console/libgnt/gntkeys.c	2006-11-23 15:22:53 UTC (rev 17816)
@@ -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()

Modified: trunk/console/libgnt/gntkeys.h
===================================================================
--- trunk/console/libgnt/gntkeys.h	2006-11-23 08:37:07 UTC (rev 17815)
+++ trunk/console/libgnt/gntkeys.h	2006-11-23 15:22:53 UTC (rev 17816)
@@ -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) : "")
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.