Build Fix -- Remove some duplicate symbol defs to appease ld.

I think recent ld is a lot less forgiving of multiple defintions of
things.  I needed this change to fix my build.

	* src/media/sound.c: Qdevice is defined in general-slots.h, don't
	redefine it here.

	* src/media/media.c: Qimage, Qtype, Qwidth, Qheight, Qunknown all
	defined in general-slots.h, don't redefine here

	* src/ent/ent-int.c: Qzero is defined in symbols.c, don't redefine
	it here.

	* src/ui/glyphs.c: Don't define Qdata or Qfile here as it's
	defined in general-slots.h

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/src/ent/ent-int.c b/src/ent/ent-int.c
index c95727e..ee95f88 100644 (file)
--- a/src/ent/ent-int.c
+++ b/src/ent/ent-int.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #include "ent.h"
 
 EMACS_INT Vmost_negative_int, Vmost_positive_int;
-Lisp_Object Qzero, Qone;
+Lisp_Object Qone;
 
 \f
 static inline int

diff --git a/src/media/media.c b/src/media/media.c
index 1359791..51d53d3 100644 (file)
--- a/src/media/media.c
+++ b/src/media/media.c
@@ -50,13 +50,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #endif
 
 Lisp_Object Qmedia_streamp;
-Lisp_Object Qunknown;
 Lisp_Object Qunavailable;
 /* media property syms */
 Lisp_Object Qdemux, Qcodec, Qnchannels, Qsamplerate;
 Lisp_Object Qbitrate, Qabitrate, Qvbitrate;
-Lisp_Object Qwidth, Qheight, Qaspect, Qdriver, Qkind, Qfifo, Quri, Qtype;
-Lisp_Object Qaudio, Qvideo, Qimage;
+Lisp_Object Qaspect, Qdriver, Qkind, Qfifo, Quri;
+Lisp_Object Qaudio, Qvideo;
 
 static void determine_stream_type(Lisp_Media_Stream *ms, media_driver);
 static void media_stream_print(Lisp_Object, Lisp_Object, int);

diff --git a/src/media/sound.c b/src/media/sound.c
index 929343a..0678fc2 100644 (file)
--- a/src/media/sound.c
+++ b/src/media/sound.c
@@ -46,7 +46,7 @@ Lisp_Object Vsound_alist;
 Lisp_Object Vsynchronous_sounds;
 Lisp_Object Vnative_sound_only_on_console;
 Lisp_Object Q_volume, Q_pitch, Q_duration, Q_sound;
-Lisp_Object Q_device, Q_server, Q_client, Q_keep_open;
+Lisp_Object Q_server, Q_client, Q_keep_open;
 Lisp_Object Qplay_sound;
 
 #ifdef HAVE_AO_SOUND

diff --git a/src/ui/glyphs.c b/src/ui/glyphs.c
index 13a67f6..ec30c86 100644 (file)
--- a/src/ui/glyphs.c
+++ b/src/ui/glyphs.c
@@ -62,7 +62,7 @@ Lisp_Object Qsubwindow_image_instance_p;
 Lisp_Object Qwidget_image_instance_p;
 Lisp_Object Qconst_glyph_variable;
 Lisp_Object Qmono_pixmap, Qcolor_pixmap, Qsubwindow;
-Lisp_Object Q_file, Q_data, Q_face, Q_pixel_width, Q_pixel_height;
+Lisp_Object Q_face, Q_pixel_width, Q_pixel_height;
 Lisp_Object Qformatted_string;
 Lisp_Object Vcurrent_display_table;
 Lisp_Object Vtruncation_glyph, Vcontinuation_glyph, Voctal_escape_glyph;