diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-10 17:01:21 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-10 17:01:21 -0700 |
| commit | 22ffb97351d1081558c070a3c134d2be99993df6 (patch) | |
| tree | 16bda44878b33d2ef8ff039ffcb5cc8d407da977 /src | |
| parent | e9a9ae0350689d352c2bdfa3af0eb722f587b966 (diff) | |
| download | emacs-22ffb97351d1081558c070a3c134d2be99993df6.tar.gz | |
Remove "#define unix" that is no longer needed (Bug#11905).
Merge from gnulib to make "#define unix" unnecessary, incorporating:
2012-07-10 getloadavg: clean out old Emacs and Autoconf cruft
2012-07-09 getopt: Simplify after Emacs changed.
* src/s/aix4-2.h (unix): Remove; no longer needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/s/aix4-2.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index de56d4160a7..0c98c0b356d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2012-07-10 Paul Eggert <eggert@cs.ucla.edu> + Remove "#define unix" that is no longer needed (Bug#11905). + * s/aix4-2.h (unix): Remove; no longer needed. + EMACS_TIME simplification (Bug#11875). This replaces macros (which typically do not work in GDB) with functions, typedefs and enums, making the code easier to debug. diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index 51ac9748f27..b7bdc8739a7 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h @@ -40,9 +40,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Special items needed to make Emacs run on this system. */ -/* AIX doesn't define this. */ -#define unix 1 - /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct. */ #define SIGNALS_VIA_CHARACTERS #define CLASH_DETECTION |