Mercurial > hg > xemacs-beta

diff src/compiler.h @ 5046:d4f666cda5e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some random fixups -------------------- ChangeLog entries follow: -------------------- man/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * internals/internals.texi (Intro to Window and Frame Geometry): Shrink diagram to fit when offset by five spaces as a result of quoting. src/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * syswindows.h: Add table about GNU Emacs -> XEmacs Windows constants from the internals manual. * frame.c: Shrink size of diagram consistent with internals manual. * alloc.c: * compiler.h: * console.c: * events.c: * gc.c (gc_stat_start_new_gc): * gc.c (gc_stat_resume_gc): * gc.c (kkcc_marking): * gc.c (gc_1): * gc.c (gc): * objects-tty.c: * redisplay-msw.c: * redisplay-msw.c (mswindows_clear_region): * syntax.c: * syntax.c (ST_COMMENT_STYLE): * sysdep.c: Fix various compiler warnings.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 03:24:08 -0600
parents cbe181529c34
children 308d34e9f07d
line wrap: on
line diff
--- a/src/compiler.h	Tue Feb 16 01:21:32 2010 -0600
+++ b/src/compiler.h	Sat Feb 20 03:24:08 2010 -0600
@@ -1,7 +1,7 @@
 /* Compiler-specific definitions for XEmacs.
    Copyright (C) 1998-1999, 2003 Free Software Foundation, Inc.
    Copyright (C) 1994 Richard Mlynarik.
-   Copyright (C) 1995, 1996, 2000-2004 Ben Wing.
+   Copyright (C) 1995, 1996, 2000-2004, 2010 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -233,23 +233,44 @@
 #  define ATTRIBUTE_UNUSED
 # endif
 # define UNUSED(decl) UNUSED_ARG (decl) ATTRIBUTE_UNUSED
-# ifdef MULE
-#  define USED_IF_MULE(decl) decl
-# else
-#  define USED_IF_MULE(decl) UNUSED (decl)
-# endif
-# ifdef HAVE_XFT
-#  define USED_IF_XFT(decl) decl
-# else
-#  define USED_IF_XFT(decl) UNUSED (decl)
-# endif
-# ifdef HAVE_SCROLLBARS
-#  define USED_IF_SCROLLBARS(decl) decl
-# else
-#  define USED_IF_SCROLLBARS(decl) UNUSED (decl)
-# endif
 #endif /* UNUSED */
 
+/* Various macros for params/variables used or unused depending on
+   config flags. */
+
+#ifdef MULE
+# define USED_IF_MULE(decl) decl
+#else
+# define USED_IF_MULE(decl) UNUSED (decl)
+#endif
+#ifdef HAVE_XFT
+# define USED_IF_XFT(decl) decl
+#else
+# define USED_IF_XFT(decl) UNUSED (decl)
+#endif
+#ifdef HAVE_SCROLLBARS
+# define USED_IF_SCROLLBARS(decl) decl
+#else
+# define USED_IF_SCROLLBARS(decl) UNUSED (decl)
+#endif
+#ifdef NEW_GC
+# define USED_IF_NEW_GC(decl) decl
+# define UNUSED_IF_NEW_GC(decl) UNUSED (decl)
+#else
+# define USED_IF_NEW_GC(decl) UNUSED (decl)
+# define UNUSED_IF_NEW_GC(decl) decl
+#endif
+#ifdef HAVE_TTY
+#define USED_IF_TTY(decl) decl
+#else
+#define USED_IF_TTY(decl) UNUSED (decl)
+#endif
+#ifdef HAVE_TOOLBARS
+#define USED_IF_TOOLBARS(decl) decl
+#else
+#define USED_IF_TOOLBARS(decl) UNUSED (decl)
+#endif
+
 /* Declaration that variable or expression X is "used" to defeat
    "unused variable" warnings.  DON'T DO THIS FOR PARAMETERS IF IT ALL
    POSSIBLE.  Use an UNUSED() or USED_IF_*() declaration on the parameter