diff options
| author | Joakim Verona | 2010-08-27 10:58:44 +0200 |
|---|---|---|
| committer | Joakim Verona | 2010-08-27 10:58:44 +0200 |
| commit | 362120833bcbbaea94976b6701633e2ed75f6051 (patch) | |
| tree | 632690a24a934bb51a32303add5172d63b6b9e00 /src/s/gnu-linux.h | |
| parent | 1800c4865b15a9e1154bf1f03d87d1aaf750a527 (diff) | |
| parent | 1a868076f51b5d6f1cf78117463e6f9c614551ec (diff) | |
| download | emacs-362120833bcbbaea94976b6701633e2ed75f6051.tar.gz emacs-362120833bcbbaea94976b6701633e2ed75f6051.zip | |
merge from trunk, fix conflicts
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 80092f725fc..cf3b3079726 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -124,8 +124,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 124 | #define INTERRUPT_INPUT | 124 | #define INTERRUPT_INPUT |
| 125 | #endif /* emacs */ | 125 | #endif /* emacs */ |
| 126 | 126 | ||
| 127 | #define SYSV_SYSTEM_DIR /* use dirent.h */ | ||
| 128 | |||
| 129 | #define POSIX /* affects getpagesize.h and systty.h */ | 127 | #define POSIX /* affects getpagesize.h and systty.h */ |
| 130 | 128 | ||
| 131 | /* This is to work around mysterious gcc failures in some system versions. | 129 | /* This is to work around mysterious gcc failures in some system versions. |