diff options
| author | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
| commit | 0c747cb143fa227e78f350ac353d703f489209df (patch) | |
| tree | 5b434055c797bd75eaa1e3d9d0773e586d44daee /src/alloc.c | |
| parent | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (diff) | |
| parent | aa095b2db98ae149737f8de00ee733b1d257ed33 (diff) | |
| download | emacs-0c747cb143fa227e78f350ac353d703f489209df.tar.gz emacs-0c747cb143fa227e78f350ac353d703f489209df.zip | |
Merge from trunk
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/alloc.c b/src/alloc.c index f2bb28e2d96..0f83f375d40 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -65,15 +65,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 65 | extern POINTER_TYPE *sbrk (); | 65 | extern POINTER_TYPE *sbrk (); |
| 66 | #endif | 66 | #endif |
| 67 | 67 | ||
| 68 | #ifdef HAVE_FCNTL_H | ||
| 69 | #include <fcntl.h> | 68 | #include <fcntl.h> |
| 70 | #endif | ||
| 71 | #ifndef O_WRONLY | ||
| 72 | #define O_WRONLY 1 | ||
| 73 | #endif | ||
| 74 | 69 | ||
| 75 | #ifdef WINDOWSNT | 70 | #ifdef WINDOWSNT |
| 76 | #include <fcntl.h> | ||
| 77 | #include "w32.h" | 71 | #include "w32.h" |
| 78 | #endif | 72 | #endif |
| 79 | 73 | ||