diff options
| author | Tom Tromey | 2012-09-04 10:10:06 -0600 |
|---|---|---|
| committer | Tom Tromey | 2012-09-04 10:10:06 -0600 |
| commit | bf69f522a9e135f9aa483cedd53e71e915f2bf75 (patch) | |
| tree | 3f73c47fb863ef87f420de1d30858da821072bd9 /src/firstfile.c | |
| parent | 303324a9232dbc89369faceb6b3530740d0fc1bd (diff) | |
| parent | 6ec9a5a7b5efb129807f567709ca858211ed7840 (diff) | |
| download | emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.tar.gz emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.zip | |
merge from trunk
Diffstat (limited to 'src/firstfile.c')
| -rw-r--r-- | src/firstfile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/firstfile.c b/src/firstfile.c index 84511cfe0ad..444fb71b55d 100644 --- a/src/firstfile.c +++ b/src/firstfile.c | |||
| @@ -27,7 +27,6 @@ static char _my_begbss[1]; | |||
| 27 | char * my_begbss_static = _my_begbss; | 27 | char * my_begbss_static = _my_begbss; |
| 28 | 28 | ||
| 29 | /* Add a dummy reference to ensure emacs.obj is linked in. */ | 29 | /* Add a dummy reference to ensure emacs.obj is linked in. */ |
| 30 | extern int initialized; | 30 | extern int main (int, char **); |
| 31 | static int * dummy = &initialized; | 31 | static int (*dummy) (int, char **) = main; |
| 32 | #endif | 32 | #endif |
| 33 | |||