procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move IF_LINT from lisp.h to conf_post.h

Browse source 
* 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).
This commit is contained in:
Glenn Morris 2012-08-10 14:23:45 -04:00
parent 1530c98e56
commit 25e65510a3
6 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib-src/ChangeLog
View file

@ -1,5 +1,8 @@
2012-08-10 Glenn Morris <rgm@gnu.org>
* 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.

7
lib-src/emacsclient.c
View file

@ -113,13 +113,6 @@ char *(getcwd) (char *, size_t);
/* 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

7
lib-src/make-docfile.c
View file

@ -63,13 +63,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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);

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-08-10 Glenn Morris <rgm@gnu.org>
* 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 <dmantipov@yandex.ru>
Fix last change to allow compilation with low optimization levels.

12
src/conf_post.h
View file

@ -218,4 +218,16 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
#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 */

15
src/lisp.h
View file

@ -3418,21 +3418,6 @@ extern char *egetenv (const char *);
/* 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. */