diff options
| author | Paul Eggert | 2011-04-25 23:17:52 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-25 23:17:52 -0700 |
| commit | 671875dac181f7f1337f21d013a9c3d5f235ddf2 (patch) | |
| tree | 4091c2537439713df8efe8d3376116a6db3eb1c5 /src/s | |
| parent | f904488ff40dcee3e340b63a6386dde124d1241c (diff) | |
| parent | 0c6b7b19e52ba18b5d4fd2d4b73b133a0a721603 (diff) | |
| download | emacs-671875dac181f7f1337f21d013a9c3d5f235ddf2.tar.gz emacs-671875dac181f7f1337f21d013a9c3d5f235ddf2.zip | |
Merge from mainline.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/ms-w32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 8b189baea46..bf6cc66798c 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h | |||
| @@ -204,6 +204,7 @@ struct sigaction { | |||
| 204 | #define dup2 sys_dup2 | 204 | #define dup2 sys_dup2 |
| 205 | #define fopen sys_fopen | 205 | #define fopen sys_fopen |
| 206 | #define link sys_link | 206 | #define link sys_link |
| 207 | #define localtime sys_localtime | ||
| 207 | #define mkdir sys_mkdir | 208 | #define mkdir sys_mkdir |
| 208 | #undef mktemp | 209 | #undef mktemp |
| 209 | #define mktemp sys_mktemp | 210 | #define mktemp sys_mktemp |