diff options
| author | Eli Zaretskii | 2011-04-06 19:05:49 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-04-06 19:05:49 +0300 |
| commit | 973f782d33cb0b9fa6caf5487ca8916838d12556 (patch) | |
| tree | 9b06c3251b3f31749936782214926a9c86bb9699 /lib | |
| parent | 0f1ba050b3e8228b47e77ec77e5047c7c3276fdf (diff) | |
| download | emacs-973f782d33cb0b9fa6caf5487ca8916838d12556.tar.gz emacs-973f782d33cb0b9fa6caf5487ca8916838d12556.zip | |
Don't call gnulib's careadlinkat on Windows.
src/w32.c (careadlinkat, careadlinkatcwd): New always-fail stubs.
lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS):
Revert last change.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/makefile.w32-in | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index 895cd0b8369..b2aececf251 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in | |||
| @@ -29,8 +29,7 @@ GNULIBOBJS = $(BLD)/dtoastr.$(O) \ | |||
| 29 | $(BLD)/strftime.$(O) \ | 29 | $(BLD)/strftime.$(O) \ |
| 30 | $(BLD)/time_r.$(O) \ | 30 | $(BLD)/time_r.$(O) \ |
| 31 | $(BLD)/md5.$(O) \ | 31 | $(BLD)/md5.$(O) \ |
| 32 | $(BLD)/filemode.$(O) \ | 32 | $(BLD)/filemode.$(O) |
| 33 | $(BLD)/careadlinkat.$(O) | ||
| 34 | 33 | ||
| 35 | # | 34 | # |
| 36 | # Build the library | 35 | # Build the library |
| @@ -119,22 +118,12 @@ $(BLD)/filemode.$(O) : \ | |||
| 119 | $(EMACS_ROOT)/src/m/intel386.h \ | 118 | $(EMACS_ROOT)/src/m/intel386.h \ |
| 120 | $(EMACS_ROOT)/src/config.h | 119 | $(EMACS_ROOT)/src/config.h |
| 121 | 120 | ||
| 122 | $(BLD)/careadlinkat.$(O) : \ | ||
| 123 | $(SRC)/careadlinkat.c \ | ||
| 124 | $(SRC)/careadlinkat.h \ | ||
| 125 | $(SRC)/allocator.h \ | ||
| 126 | $(EMACS_ROOT)/nt/inc/unistd.h \ | ||
| 127 | $(EMACS_ROOT)/nt/inc/sys/stat.h \ | ||
| 128 | $(EMACS_ROOT)/src/s/ms-w32.h \ | ||
| 129 | $(EMACS_ROOT)/src/m/intel386.h \ | ||
| 130 | $(EMACS_ROOT)/src/config.h | ||
| 131 | |||
| 132 | # The following dependencies are for supporting parallel builds, where | 121 | # The following dependencies are for supporting parallel builds, where |
| 133 | # we must make sure $(BLD) exists before any compilation starts. | 122 | # we must make sure $(BLD) exists before any compilation starts. |
| 134 | # | 123 | # |
| 135 | $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD | 124 | $(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD |
| 136 | $(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD | 125 | $(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD |
| 137 | $(BLD)/filemode.$(O) $(BLD)/careadlinkat.$(O): stamp_BLD | 126 | $(BLD)/filemode.$(O): stamp_BLD |
| 138 | 127 | ||
| 139 | # | 128 | # |
| 140 | # Headers we would preprocess if we could. | 129 | # Headers we would preprocess if we could. |