diff options
| author | Eli Zaretskii | 2013-02-12 05:52:04 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-02-12 05:52:04 +0200 |
| commit | 8c0905acd1e4457c9956d7fa02e88aadc075a56f (patch) | |
| tree | ccf3a9f3d9b3e5bf5593107696b74762373d748f | |
| parent | 71b84316436598773995a710c1686cce427b41f2 (diff) | |
| download | emacs-8c0905acd1e4457c9956d7fa02e88aadc075a56f.tar.gz emacs-8c0905acd1e4457c9956d7fa02e88aadc075a56f.zip | |
MS-Windows followup for 2013-02-11T23:37:18Z!eggert@cs.ucla.edu.
lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/memrchr.$(O).
($(BLD)/memrchr.$(O)): New dependency.
nt/inc/ms-w32.h: Add prototype for memrchr.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/makefile.w32-in | 5 | ||||
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/inc/ms-w32.h | 3 |
4 files changed, 17 insertions, 0 deletions
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-02-12 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/memrchr.$(O). | ||
| 4 | ($(BLD)/memrchr.$(O)): New dependency. | ||
| 5 | |||
| 1 | 2013-02-11 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-02-11 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Tune by using memchr and memrchr. | 8 | Tune by using memchr and memrchr. |
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index d5128cc9a61..cd62fbcd13d 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in | |||
| @@ -34,6 +34,7 @@ GNULIBOBJS = $(BLD)/c-ctype.$(O) \ | |||
| 34 | $(BLD)/getopt.$(O) \ | 34 | $(BLD)/getopt.$(O) \ |
| 35 | $(BLD)/getopt1.$(O) \ | 35 | $(BLD)/getopt1.$(O) \ |
| 36 | $(BLD)/gettime.$(O) \ | 36 | $(BLD)/gettime.$(O) \ |
| 37 | $(BLD)/memrchr.$(O) \ | ||
| 37 | $(BLD)/strftime.$(O) \ | 38 | $(BLD)/strftime.$(O) \ |
| 38 | $(BLD)/time_r.$(O) \ | 39 | $(BLD)/time_r.$(O) \ |
| 39 | $(BLD)/timespec-add.$(O) \ | 40 | $(BLD)/timespec-add.$(O) \ |
| @@ -201,6 +202,10 @@ $(BLD)/md5.$(O) : \ | |||
| 201 | $(CONFIG_H) \ | 202 | $(CONFIG_H) \ |
| 202 | $(MD5_H) | 203 | $(MD5_H) |
| 203 | 204 | ||
| 205 | $(BLD)/memrchr.$(O) : \ | ||
| 206 | $(GNU_LIB)/memrchr.c \ | ||
| 207 | $(CONFIG_H) | ||
| 208 | |||
| 204 | $(BLD)/sha1.$(O) : \ | 209 | $(BLD)/sha1.$(O) : \ |
| 205 | $(GNU_LIB)/sha1.c \ | 210 | $(GNU_LIB)/sha1.c \ |
| 206 | $(NT_INC)/stdalign.h \ | 211 | $(NT_INC)/stdalign.h \ |
diff --git a/nt/ChangeLog b/nt/ChangeLog index b2a481354bc..1d3f7b7f49f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-02-12 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * inc/ms-w32.h: Add prototype for memrchr. | ||
| 4 | |||
| 1 | 2013-02-01 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-02-01 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Use fdopendir, fstatat and readlinkat, for efficiency (Bug#13539). | 7 | Use fdopendir, fstatat and readlinkat, for efficiency (Bug#13539). |
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index c10c4d9e02d..a74c74b4548 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h | |||
| @@ -394,6 +394,9 @@ extern int sys_putenv (char *); | |||
| 394 | extern int getloadavg (double *, int); | 394 | extern int getloadavg (double *, int); |
| 395 | extern int getpagesize (void); | 395 | extern int getpagesize (void); |
| 396 | 396 | ||
| 397 | extern void * memrchr (void const *, int, size_t); | ||
| 398 | |||
| 399 | |||
| 397 | #if defined (__MINGW32__) | 400 | #if defined (__MINGW32__) |
| 398 | 401 | ||
| 399 | /* Define to 1 if the system has the type `long long int'. */ | 402 | /* Define to 1 if the system has the type `long long int'. */ |