aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-08-10 14:23:45 -0400
committerGlenn Morris2012-08-10 14:23:45 -0400
commit25e65510a3d35524ade205c3114970c43dc6ae05 (patch)
treed7a273c6b8cc4fbecaaae8d237950d26acaf8d66 /src
parent1530c98e56d331a21ba7ef2c940d1441442ac798 (diff)
downloademacs-25e65510a3d35524ade205c3114970c43dc6ae05.tar.gz
emacs-25e65510a3d35524ade205c3114970c43dc6ae05.zip
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).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/conf_post.h12
-rw-r--r--src/lisp.h15
3 files changed, 17 insertions, 15 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 82b761a29c0..3b88f5c94e9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-08-10 Glenn Morris <rgm@gnu.org>
2
3 * conf_post.h (IF_LINT, lint_assume): Move here from lisp.h.
4 * lisp.h (IF_LINT, lint_assume): Move to conf_post.h.
5
12012-08-10 Dmitry Antipov <dmantipov@yandex.ru> 62012-08-10 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 Fix last change to allow compilation with low optimization levels. 8 Fix last change to allow compilation with low optimization levels.
diff --git a/src/conf_post.h b/src/conf_post.h
index e935940e54a..ead7298e98d 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -218,4 +218,16 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
218#define INLINE_HEADER_BEGIN _GL_INLINE_HEADER_BEGIN 218#define INLINE_HEADER_BEGIN _GL_INLINE_HEADER_BEGIN
219#define INLINE_HEADER_END _GL_INLINE_HEADER_END 219#define INLINE_HEADER_END _GL_INLINE_HEADER_END
220 220
221/* Use this to suppress gcc's `...may be used before initialized' warnings. */
222#ifdef lint
223/* Use CODE only if lint checking is in effect. */
224# define IF_LINT(Code) Code
225/* Assume that the expression COND is true. This differs in intent
226 from 'assert', as it is a message from the programmer to the compiler. */
227# define lint_assume(cond) ((cond) ? (void) 0 : abort ())
228#else
229# define IF_LINT(Code) /* empty */
230# define lint_assume(cond) ((void) (0 && (cond)))
231#endif
232
221/* conf_post.h ends here */ 233/* conf_post.h ends here */
diff --git a/src/lisp.h b/src/lisp.h
index e23093f56c9..3dbea6e0f72 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3418,21 +3418,6 @@ extern char *egetenv (const char *);
3418/* Set up the name of the machine we're running on. */ 3418/* Set up the name of the machine we're running on. */
3419extern void init_system_name (void); 3419extern void init_system_name (void);
3420 3420
3421/* Use this to suppress gcc's warnings. */
3422#ifdef lint
3423
3424/* Use CODE only if lint checking is in effect. */
3425# define IF_LINT(Code) Code
3426
3427/* Assume that the expression COND is true. This differs in intent
3428 from 'assert', as it is a message from the programmer to the compiler. */
3429# define lint_assume(cond) ((cond) ? (void) 0 : abort ())
3430
3431#else
3432# define IF_LINT(Code) /* empty */
3433# define lint_assume(cond) ((void) (0 && (cond)))
3434#endif
3435
3436/* We used to use `abs', but that clashes with system headers on some 3421/* We used to use `abs', but that clashes with system headers on some
3437 platforms, and using a name reserved by Standard C is a bad idea 3422 platforms, and using a name reserved by Standard C is a bad idea
3438 anyway. */ 3423 anyway. */