diff options
| author | Juanma Barranquero | 2012-10-02 02:08:54 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2012-10-02 02:08:54 +0200 |
| commit | 81550bf43d3f306f998fdc06d1924aeb9de36f66 (patch) | |
| tree | 4d6733b1a08e13e74f50fbb360d2c3da0797e7e0 /src | |
| parent | aa1ba90e4a95542c83cf636de3bc67e8fb23bad3 (diff) | |
| download | emacs-81550bf43d3f306f998fdc06d1924aeb9de36f66.tar.gz emacs-81550bf43d3f306f998fdc06d1924aeb9de36f66.zip | |
src/makefile.w32-in ($(BLD)/alloc.$(O), $(BLD)/gmalloc.$(O)): Update dependencies.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/makefile.w32-in | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3a94af80c30..56e75b5efce 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-10-02 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(BLD)/alloc.$(O), $(BLD)/gmalloc.$(O)): | ||
| 4 | Update dependencies. | ||
| 5 | |||
| 1 | 2012-10-01 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2012-10-01 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Fix a malloc race condition involving strsignal. | 8 | Fix a malloc race condition involving strsignal. |
diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 5509f7d3afc..c6fbf59fb5a 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in | |||
| @@ -485,6 +485,7 @@ $(BLD)/alloc.$(O) : \ | |||
| 485 | $(SRC)/blockinput.h \ | 485 | $(SRC)/blockinput.h \ |
| 486 | $(SRC)/puresize.h \ | 486 | $(SRC)/puresize.h \ |
| 487 | $(SRC)/w32.h \ | 487 | $(SRC)/w32.h \ |
| 488 | $(SRC)/w32heap.h \ | ||
| 488 | $(NT_INC)/unistd.h \ | 489 | $(NT_INC)/unistd.h \ |
| 489 | $(GNU_LIB)/verify.h \ | 490 | $(GNU_LIB)/verify.h \ |
| 490 | $(BUFFER_H) \ | 491 | $(BUFFER_H) \ |
| @@ -955,6 +956,7 @@ $(BLD)/fringe.$(O) : \ | |||
| 955 | 956 | ||
| 956 | $(BLD)/gmalloc.$(O) : \ | 957 | $(BLD)/gmalloc.$(O) : \ |
| 957 | $(SRC)/gmalloc.c \ | 958 | $(SRC)/gmalloc.c \ |
| 959 | $(SRC)/w32heap.h \ | ||
| 958 | $(NT_INC)/stdint.h \ | 960 | $(NT_INC)/stdint.h \ |
| 959 | $(NT_INC)/unistd.h \ | 961 | $(NT_INC)/unistd.h \ |
| 960 | $(CONFIG_H) | 962 | $(CONFIG_H) |