diff options
| author | Eli Zaretskii | 2013-01-28 16:41:08 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-01-28 16:41:08 +0200 |
| commit | cf01a359814c892e91261b4a2b6ae50302007db2 (patch) | |
| tree | 3ad9d68c559ac9130482d892d2ada52d60605630 | |
| parent | 6fd326b7aef68e0cc1655ee03b4324edeee1dbd9 (diff) | |
| download | emacs-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/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/inc/dirent.h | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32.c | 2 |
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 @@ | |||
| 1 | 2013-01-28 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * inc/dirent.h (opendir): Update prototype. | ||
| 4 | |||
| 1 | 2013-01-11 Eli Zaretskii <eliz@gnu.org> | 5 | 2013-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 | ||
| 33 | extern DIR *opendir (char *); | 33 | extern DIR *opendir (const char *); |
| 34 | extern struct dirent *readdir (DIR *); | 34 | extern struct dirent *readdir (DIR *); |
| 35 | extern void seekdir (DIR *, long); | 35 | extern void seekdir (DIR *, long); |
| 36 | extern void closedir (DIR *); | 36 | extern 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 @@ | |||
| 1 | 2013-01-28 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32.c (opendir): Now accepts a 'const char *'. | ||
| 4 | |||
| 1 | 2013-01-28 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2013-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 |
| @@ -2809,7 +2809,7 @@ static char *read_unc_volume (HANDLE, char *, int); | |||
| 2809 | static void close_unc_volume (HANDLE); | 2809 | static void close_unc_volume (HANDLE); |
| 2810 | 2810 | ||
| 2811 | DIR * | 2811 | DIR * |
| 2812 | opendir (char *filename) | 2812 | opendir (const char *filename) |
| 2813 | { | 2813 | { |
| 2814 | DIR *dirp; | 2814 | DIR *dirp; |
| 2815 | 2815 | ||