aboutsummaryrefslogtreecommitdiffstats
path: root/src/s
diff options
context:
space:
mode:
authorGlenn Morris2011-04-22 20:07:16 -0700
committerGlenn Morris2011-04-22 20:07:16 -0700
commit4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640 (patch)
tree26c20c7c4da56fae7e041c9345c76cce1224188c /src/s
parent81de9236e1daa1fe7dfd0ef9aaaf1e13b6aa74e4 (diff)
parentbe71f8100a71a5b896ef05c32f51a09a3d9e3993 (diff)
downloademacs-4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640.tar.gz
emacs-4ffd0d6b569d252e4e807d4e9c9d6a5bd5b08640.zip
Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.
Diffstat (limited to 'src/s')
-rw-r--r--src/s/ms-w32.h1
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