diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /src/s/aix4-2.h | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'src/s/aix4-2.h')
| -rw-r--r-- | src/s/aix4-2.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index c2715fffe01..37b041396f9 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright (C) 1999, 2001-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 1999, 2001-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -47,11 +47,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 47 | /* AIX doesn't define this. */ | 47 | /* AIX doesn't define this. */ |
| 48 | #define unix 1 | 48 | #define unix 1 |
| 49 | 49 | ||
| 50 | /* string.h defines rindex as a macro, at least with native cc, so we | ||
| 51 | lose declaring char * rindex without this. | ||
| 52 | It is just a guess which versions of AIX need this definition. */ | ||
| 53 | #undef HAVE_STRING_H | ||
| 54 | |||
| 55 | /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct. */ | 50 | /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct. */ |
| 56 | #define SIGNALS_VIA_CHARACTERS | 51 | #define SIGNALS_VIA_CHARACTERS |
| 57 | #define CLASH_DETECTION | 52 | #define CLASH_DETECTION |