diff options
| author | Jan Djärv | 2010-04-02 11:45:27 +0200 |
|---|---|---|
| committer | Jan Djärv | 2010-04-02 11:45:27 +0200 |
| commit | 7a5a264fc27bde6870f08ecc5d85eddc36fa0336 (patch) | |
| tree | 54106d60bd5f2273821bb5e3fb73bebf31a5599e /src/buffer.c | |
| parent | d0b228766f1471ed104d2e038f63cd4627d79b57 (diff) | |
| parent | 9cb52861f287cbad4608a5fceddae5bac1a90ba6 (diff) | |
| download | emacs-7a5a264fc27bde6870f08ecc5d85eddc36fa0336.tar.gz emacs-7a5a264fc27bde6870f08ecc5d85eddc36fa0336.zip | |
Merge from trunk
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/buffer.c b/src/buffer.c index 0c6e57d45be..9035a986b4c 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -28,11 +28,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 28 | #include <stdio.h> | 28 | #include <stdio.h> |
| 29 | #include <setjmp.h> | 29 | #include <setjmp.h> |
| 30 | 30 | ||
| 31 | #ifndef USE_CRT_DLL | ||
| 32 | extern int errno; | ||
| 33 | #endif | ||
| 34 | |||
| 35 | |||
| 36 | #ifdef HAVE_UNISTD_H | 31 | #ifdef HAVE_UNISTD_H |
| 37 | #include <unistd.h> | 32 | #include <unistd.h> |
| 38 | #endif | 33 | #endif |
| @@ -4627,7 +4622,6 @@ buffer_slot_type_mismatch (newval, type) | |||
| 4627 | #endif | 4622 | #endif |
| 4628 | 4623 | ||
| 4629 | #include <stdio.h> | 4624 | #include <stdio.h> |
| 4630 | #include <errno.h> | ||
| 4631 | 4625 | ||
| 4632 | #if MAP_ANON == 0 | 4626 | #if MAP_ANON == 0 |
| 4633 | #include <fcntl.h> | 4627 | #include <fcntl.h> |