aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-01-28 16:41:08 +0200
committerEli Zaretskii2013-01-28 16:41:08 +0200
commitcf01a359814c892e91261b4a2b6ae50302007db2 (patch)
tree3ad9d68c559ac9130482d892d2ada52d60605630
parent6fd326b7aef68e0cc1655ee03b4324edeee1dbd9 (diff)
downloademacs-cf01a359814c892e91261b4a2b6ae50302007db2.tar.gz
emacs-cf01a359814c892e91261b4a2b6ae50302007db2.zip
Make opendir on MS-Windows accept a 'const char *'.
src/w32.c (opendir): Now accepts a 'const char *'. nt/inc/dirent.h (opendir): Update prototype.
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/inc/dirent.h2
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32.c2
4 files changed, 10 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index aca1236657b..8b8628db1e2 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
12013-01-28 Eli Zaretskii <eliz@gnu.org>
2
3 * inc/dirent.h (opendir): Update prototype.
4
12013-01-11 Eli Zaretskii <eliz@gnu.org> 52013-01-11 Eli Zaretskii <eliz@gnu.org>
2 6
3 * inc/unistd.h (O_IGNORE_CTTY): Define, as it is unconditionally 7 * inc/unistd.h (O_IGNORE_CTTY): Define, as it is unconditionally
diff --git a/nt/inc/dirent.h b/nt/inc/dirent.h
index 618f3beddf0..676b82d207b 100644
--- a/nt/inc/dirent.h
+++ b/nt/inc/dirent.h
@@ -30,7 +30,7 @@ typedef struct
30 char dd_buf[DIRBLKSIZ]; /* directory block */ 30 char dd_buf[DIRBLKSIZ]; /* directory block */
31 } DIR; /* stream data from opendir() */ 31 } DIR; /* stream data from opendir() */
32 32
33extern DIR *opendir (char *); 33extern DIR *opendir (const char *);
34extern struct dirent *readdir (DIR *); 34extern struct dirent *readdir (DIR *);
35extern void seekdir (DIR *, long); 35extern void seekdir (DIR *, long);
36extern void closedir (DIR *); 36extern void closedir (DIR *);
diff --git a/src/ChangeLog b/src/ChangeLog
index 221d525f16e..abbe4ed6dd4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-01-28 Eli Zaretskii <eliz@gnu.org>
2
3 * w32.c (opendir): Now accepts a 'const char *'.
4
12013-01-28 Dmitry Antipov <dmantipov@yandex.ru> 52013-01-28 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 Remove obsolete redisplay code. See the discussion at 7 Remove obsolete redisplay code. See the discussion at
diff --git a/src/w32.c b/src/w32.c
index f722bc5f397..6bcc8e19278 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2809,7 +2809,7 @@ static char *read_unc_volume (HANDLE, char *, int);
2809static void close_unc_volume (HANDLE); 2809static void close_unc_volume (HANDLE);
2810 2810
2811DIR * 2811DIR *
2812opendir (char *filename) 2812opendir (const char *filename)
2813{ 2813{
2814 DIR *dirp; 2814 DIR *dirp;
2815 2815