Mercurial > hg > xemacs-beta
changeset 1746:18d2b8dabcf7
[xemacs-hg @ 2003-10-14 16:34:54 by stephent]
NAS version #defines <878ynnaipw.fsf@tleepslib.sk.tsukuba.ac.jp>
XtSetArg idiom fix <874qybaihp.fsf@tleepslib.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Tue, 14 Oct 2003 16:34:57 +0000 |
| parents | d91e7fd568fd |
| children | 8fcb82013b26 |
| files | src/ChangeLog src/frame-x.c src/nas.c |
| diffstat | 3 files changed, 26 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Oct 14 16:10:06 2003 +0000 +++ b/src/ChangeLog Tue Oct 14 16:34:57 2003 +0000 @@ -1,3 +1,12 @@ +2003-10-13 Stephen J. Turnbull <stephen@xemacs.org> + + * nas.c (AudioLibraryVersionMajor, AudioLibraryVersionMinor): + Ensure they are #define'd. + +2003-10-13 Stephen J. Turnbull <stephen@xemacs.org> + + * frame-x.c (x_update_frame_external_traits): Fix XtSetArg idiom. + 2003-10-14 Jerry James <james@xemacs.org> * compiler.h: Check __GNUC_PATCHLEVEL__ definition.
--- a/src/frame-x.c Tue Oct 14 16:10:06 2003 +0000 +++ b/src/frame-x.c Tue Oct 14 16:34:57 2003 +0000 @@ -2728,9 +2728,11 @@ Lisp_Object font = FACE_FONT (Vdefault_face, frame, Vcharset_ascii); if (!EQ (font, Vthe_null_font_instance)) - XtSetArg (al[ac], XtNfont, - (void *) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font))); - ac++; + { + XtSetArg (al[ac], XtNfont, + (void *) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font))); + ac++; + } } else abort ();
--- a/src/nas.c Tue Oct 14 16:10:06 2003 +0000 +++ b/src/nas.c Tue Oct 14 16:34:57 2003 +0000 @@ -113,6 +113,18 @@ # include <audio/Xtutil.h> #endif +/* audiolib <= some version doesn't define major and minor versions */ +/* Do NOT use AudioLibraryVersion in this file. */ +#ifndef AudioLibraryVersion +#define AudioLibraryVersion 1 +#endif +#ifndef AudioLibraryVersionMajor +#define AudioLibraryVersionMajor AudioLibraryVersion +#endif +#ifndef AudioLibraryVersionMinor +#define AudioLibraryVersionMinor 0 +#endif + #if defined (ROBUST_PLAY) static AuBool CatchIoErrorAndJump (AuServer *aud); static AuBool CatchErrorAndJump (AuServer *aud, AuErrorEvent *event);