Fix link errors in the Mac OS build that were caused by variables being marked as...

diff --git a/src/ChangeLog b/src/ChangeLog
index 8ab1974ed58197251d9333a92b86d8e81fb848aa..706751bbdfab2b2eaf4f7080388a1f21ad705592 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-15  Ben Key  <bkey76@gmail.com>
+
+       * keyboard.c (Qundefined):  Don't declare static since it is
+       used in nsfns.m.
+       * xfaces.c (Qbold, Qexpanded, Qitalic, Qcondensed):  Don't
+       declare static since they are used in nsfont.m.
+
 2011-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * process.c (Qprocessp): Don't declare static.

diff --git a/src/keyboard.c b/src/keyboard.c
index 7895d05b34f76574748080db3eeb38d26c0cb480..c0c53c82714bb03badf5c055a8608735dcc29f7e 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -246,7 +246,7 @@ Lisp_Object QPRIMARY;
 static Lisp_Object Qself_insert_command;
 static Lisp_Object Qforward_char;
 static Lisp_Object Qbackward_char;
-static Lisp_Object Qundefined;
+Lisp_Object Qundefined;
 static Lisp_Object Qtimer_event_handler;
 
 /* read_key_sequence stores here the command definition of the

diff --git a/src/xfaces.c b/src/xfaces.c
index 6d8acd77d87af1fe62d67d7bb01617740b605977..5cfe99d1285f7a86fd13c209ac95af34061a875c 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -317,11 +317,15 @@ static Lisp_Object QCfontset;
 /* Symbols used for attribute values.  */
 
 Lisp_Object Qnormal;
-static Lisp_Object Qbold, Qultra_light, Qextra_light, Qlight;
+Lisp_Object Qbold;
+static Lisp_Object Qultra_light, Qextra_light, Qlight;
 static Lisp_Object Qsemi_light, Qsemi_bold, Qextra_bold, Qultra_bold;
-static Lisp_Object Qoblique, Qitalic, Qreverse_oblique, Qreverse_italic;
-static Lisp_Object Qultra_condensed, Qextra_condensed, Qcondensed;
-static Lisp_Object Qsemi_condensed, Qsemi_expanded, Qexpanded, Qextra_expanded;
+static Lisp_Object Qoblique, Qreverse_oblique, Qreverse_italic;
+Lisp_Object Qitalic;
+static Lisp_Object Qultra_condensed, Qextra_condensed;
+Lisp_Object Qcondensed;
+static Lisp_Object Qsemi_condensed, Qsemi_expanded, Qextra_expanded;
+Lisp_Object Qexpanded;
 static Lisp_Object Qultra_expanded;
 static Lisp_Object Qreleased_button, Qpressed_button;
 static Lisp_Object QCstyle, QCcolor, QCline_width;