summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
6fe0649)
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>
#include "ent.h"
EMACS_INT Vmost_negative_int, Vmost_positive_int;
#include "ent.h"
EMACS_INT Vmost_negative_int, Vmost_positive_int;
-Lisp_Object Qzero, Qone;
#endif
Lisp_Object Qmedia_streamp;
#endif
Lisp_Object Qmedia_streamp;
Lisp_Object Qunavailable;
/* media property syms */
Lisp_Object Qdemux, Qcodec, Qnchannels, Qsamplerate;
Lisp_Object Qbitrate, Qabitrate, Qvbitrate;
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);
static void determine_stream_type(Lisp_Media_Stream *ms, media_driver);
static void media_stream_print(Lisp_Object, Lisp_Object, int);
Lisp_Object Vsynchronous_sounds;
Lisp_Object Vnative_sound_only_on_console;
Lisp_Object Q_volume, Q_pitch, Q_duration, Q_sound;
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
Lisp_Object Qplay_sound;
#ifdef HAVE_AO_SOUND
Lisp_Object Qwidget_image_instance_p;
Lisp_Object Qconst_glyph_variable;
Lisp_Object Qmono_pixmap, Qcolor_pixmap, Qsubwindow;
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;
Lisp_Object Qformatted_string;
Lisp_Object Vcurrent_display_table;
Lisp_Object Vtruncation_glyph, Vcontinuation_glyph, Voctal_escape_glyph;