diff options
| author | Daniel Colascione | 2012-09-17 04:07:36 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-09-17 04:07:36 -0800 |
| commit | 2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (patch) | |
| tree | 6dd6784d63e54cb18071df8e28fbdbc27d418728 /src/firstfile.c | |
| parent | f701ab72dd55460d23c8b029550aa4d7ecef3cfa (diff) | |
| parent | bb7dce392f6d9d5fc4b9d7de09ff920a52f07669 (diff) | |
| download | emacs-2ab329f3b5d52a39f0a45c3d9c129f1c19560142.tar.gz emacs-2ab329f3b5d52a39f0a45c3d9c129f1c19560142.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 | |||