mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 23:31:55 -08:00
Code Issues Projects Releases Wiki Activity

* emacs.c (DEFINE_DUMMY_FUNCTION): New macro.

Browse source 
(__do_global_ctors, __do_global_ctors_aux, __do_global_dtors, __main):
Use it.
This commit is contained in:
Paul Eggert 2011-03-13 20:49:40 -07:00
parent 74f10ca71b
commit 244fc23d16
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,6 +1,9 @@
2011-03-14 Paul Eggert <eggert@cs.ucla.edu>
* emacs.c (init_cmdargs): Rename local to avoid shadowing.
(DEFINE_DUMMY_FUNCTION): New macro.
(__do_global_ctors, __do_global_ctors_aux, __do_global_dtors, __main):
Use it.
* lisp.h (fatal_error_signal): Add decl, since it's exported.

17
src/emacs.c
View file

@ -547,21 +547,22 @@ static char dump_tz[] = "UtC0";
Provide dummy definitions to avoid error.
(We don't have any real constructors or destructors.) */
#ifdef __GNUC__
/* Define a dummy function F. Declare F too, to pacify gcc
-Wmissing-prototypes. */
#define DEFINE_DUMMY_FUNCTION(f) void f (void); void f (void) {}
#ifndef GCC_CTORS_IN_LIBC
void __do_global_ctors (void)
{}
void __do_global_ctors_aux (void)
{}
void __do_global_dtors (void)
{}
DEFINE_DUMMY_FUNCTION (__do_global_ctors)
DEFINE_DUMMY_FUNCTION (__do_global_ctors_aux)
DEFINE_DUMMY_FUNCTION (__do_global_dtors)
/* GNU/Linux has a bug in its library; avoid an error. */
#ifndef GNU_LINUX
char * __CTOR_LIST__[2] = { (char *) (-1), 0 };
#endif
char * __DTOR_LIST__[2] = { (char *) (-1), 0 };
#endif /* GCC_CTORS_IN_LIBC */
void __main (void)
{}
DEFINE_DUMMY_FUNCTION (__main)
#endif /* __GNUC__ */
#endif /* ORDINARY_LINK */