[Emacs-diffs] /srv/bzr/emacs/trunk r109556: Move IF_LINT from lisp.h to conf_post.h

[Glenn Morris]

------------------------------------------------------------
revno: 109556
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-08-10 14:23:45 -0400
message:
  Move IF_LINT from lisp.h to conf_post.h
  
  * src/conf_post.h (IF_LINT, lint_assume): Move here from lisp.h.
  * src/lisp.h (IF_LINT, lint_assume): Move to conf_post.h.
  
  * lib-src/make-docfile.c (IF_LINT):
  * lib-src/emacsclient.c (IF_LINT): Remove (in config.h now).
modified:
  lib-src/ChangeLog
  lib-src/emacsclient.c
  lib-src/make-docfile.c
  src/ChangeLog
  src/conf_post.h
  src/lisp.h

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-08-10 00:16:33 +0000
+++ b/lib-src/ChangeLog 2012-08-10 18:23:45 +0000
@@ -1,5 +1,8 @@
 2012-08-10  Glenn Morris  <address@hidden>
 
+       * make-docfile.c (IF_LINT):
+       * emacsclient.c (IF_LINT): Remove (in config.h now).
+
        * make-docfile.c (main):
        (fopen) [!WINDOWSNT]:
        (chdir) [!DOS_NT]: No more need to undef.

=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c     2012-08-10 00:02:10 +0000
+++ b/lib-src/emacsclient.c     2012-08-10 18:23:45 +0000
@@ -113,13 +113,6 @@
 /* Additional space when allocating buffers for filenames, etc.  */
 #define EXTRA_SPACE 100
 
-/* Use this to suppress gcc's `...may be used before initialized' warnings. */
-#ifdef lint
-# define IF_LINT(Code) Code
-#else
-# define IF_LINT(Code) /* empty */
-#endif
-
 #ifdef min
 #undef min
 #endif

=== modified file 'lib-src/make-docfile.c'
--- a/lib-src/make-docfile.c    2012-08-10 00:16:33 +0000
+++ b/lib-src/make-docfile.c    2012-08-10 18:23:45 +0000
@@ -63,13 +63,6 @@
 #define READ_BINARY "r"
 #endif /* not DOS_NT */
 
-/* Use this to suppress gcc's `...may be used before initialized' warnings.  */
-#ifdef lint
-# define IF_LINT(Code) Code
-#else
-# define IF_LINT(Code) /* empty */
-#endif
-
 static int scan_file (char *filename);
 static int scan_lisp_file (const char *filename, const char *mode);
 static int scan_c_file (char *filename, const char *mode);

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-10 13:24:20 +0000
+++ b/src/ChangeLog     2012-08-10 18:23:45 +0000
@@ -1,3 +1,8 @@
+2012-08-10  Glenn Morris  <address@hidden>
+
+       * conf_post.h (IF_LINT, lint_assume): Move here from lisp.h.
+       * lisp.h (IF_LINT, lint_assume): Move to conf_post.h.
+
 2012-08-10  Dmitry Antipov  <address@hidden>
 
        Fix last change to allow compilation with low optimization levels.

=== modified file 'src/conf_post.h'
--- a/src/conf_post.h   2012-08-02 07:31:34 +0000
+++ b/src/conf_post.h   2012-08-10 18:23:45 +0000
@@ -218,4 +218,16 @@
 #define INLINE_HEADER_BEGIN _GL_INLINE_HEADER_BEGIN
 #define INLINE_HEADER_END _GL_INLINE_HEADER_END
 
+/* Use this to suppress gcc's `...may be used before initialized' warnings. */
+#ifdef lint
+/* Use CODE only if lint checking is in effect.  */
+# define IF_LINT(Code) Code
+/* Assume that the expression COND is true.  This differs in intent
+   from 'assert', as it is a message from the programmer to the compiler.  */
+# define lint_assume(cond) ((cond) ? (void) 0 : abort ())
+#else
+# define IF_LINT(Code) /* empty */
+# define lint_assume(cond) ((void) (0 && (cond)))
+#endif
+
 /* conf_post.h ends here */

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-08-10 09:24:03 +0000
+++ b/src/lisp.h        2012-08-10 18:23:45 +0000
@@ -3418,21 +3418,6 @@
 /* Set up the name of the machine we're running on.  */
 extern void init_system_name (void);
 
-/* Use this to suppress gcc's warnings.  */
-#ifdef lint
-
-/* Use CODE only if lint checking is in effect.  */
-# define IF_LINT(Code) Code
-
-/* Assume that the expression COND is true.  This differs in intent
-   from 'assert', as it is a message from the programmer to the compiler.  */
-# define lint_assume(cond) ((cond) ? (void) 0 : abort ())
-
-#else
-# define IF_LINT(Code) /* empty */
-# define lint_assume(cond) ((void) (0 && (cond)))
-#endif
-
 /* We used to use `abs', but that clashes with system headers on some
    platforms, and using a name reserved by Standard C is a bad idea
    anyway.  */