diff options
| author | Paul Eggert | 2012-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 11:19:24 -0700 |
| commit | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (patch) | |
| tree | d38e7bf5307837f2f38982757f088100de18a64e /src/sysdep.c | |
| parent | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (diff) | |
| parent | a8d3cbf75d219d7a249fc0623219511179e959da (diff) | |
| download | emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.tar.gz emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.zip | |
Merge from trunk.
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index 9d09d1d2c67..a82f802a785 100644 --- a/src/sysdep.c +++ b/src/sysdep.c | |||
| @@ -52,9 +52,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 52 | #define read sys_read | 52 | #define read sys_read |
| 53 | #define write sys_write | 53 | #define write sys_write |
| 54 | #include <windows.h> | 54 | #include <windows.h> |
| 55 | #ifndef NULL | ||
| 56 | #define NULL 0 | ||
| 57 | #endif | ||
| 58 | #endif /* not WINDOWSNT */ | 55 | #endif /* not WINDOWSNT */ |
| 59 | 56 | ||
| 60 | #include <sys/types.h> | 57 | #include <sys/types.h> |