diff options
| author | Paul Eggert | 2011-02-17 23:44:39 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-17 23:44:39 -0800 |
| commit | 37b3d30244ad822e049b6b20c2eadf5946cb02cc (patch) | |
| tree | 49bfe5e475aee761975f2618be4ee1b7c8371a72 /src/s | |
| parent | 0ca2f89e09202a02f392c1defba2105b69c01419 (diff) | |
| parent | 7d315eb67800796d7d7f39030eb7682340d985e5 (diff) | |
| download | emacs-37b3d30244ad822e049b6b20c2eadf5946cb02cc.tar.gz emacs-37b3d30244ad822e049b6b20c2eadf5946cb02cc.zip | |
Merge from mainline.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/ms-w32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 34814687597..8b189baea46 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h | |||
| @@ -181,8 +181,6 @@ struct sigaction { | |||
| 181 | #define HAVE_MENUS 1 | 181 | #define HAVE_MENUS 1 |
| 182 | #endif | 182 | #endif |
| 183 | 183 | ||
| 184 | #define MODE_LINE_BINARY_TEXT(_b_) (NILP (B_(_b_,buffer_file_type)) ? "T" : "B") | ||
| 185 | |||
| 186 | /* Get some redefinitions in place. */ | 184 | /* Get some redefinitions in place. */ |
| 187 | 185 | ||
| 188 | #ifdef emacs | 186 | #ifdef emacs |
| @@ -348,6 +346,8 @@ extern char *get_emacs_configuration_options (void); | |||
| 348 | #endif | 346 | #endif |
| 349 | #include <string.h> | 347 | #include <string.h> |
| 350 | 348 | ||
| 349 | extern int getloadavg (double *, int); | ||
| 350 | |||
| 351 | /* We need a little extra space, see ../../lisp/loadup.el. */ | 351 | /* We need a little extra space, see ../../lisp/loadup.el. */ |
| 352 | #define SYSTEM_PURESIZE_EXTRA 50000 | 352 | #define SYSTEM_PURESIZE_EXTRA 50000 |
| 353 | 353 | ||