diff options
| author | Miles Bader <miles@gnu.org> | 2005-01-02 09:13:19 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-01-02 09:13:19 +0000 |
| commit | f1d34bcacd8dd9d730000f1fe8827559e1c89683 (patch) | |
| tree | 9fd51451ad8b295052bf912ed49c73d7b4d1c9a3 /src/fns.c | |
| parent | 0e9dd01c1246ee481efa3e71462d9db952072176 (diff) | |
| parent | 553fd77e2511cdc4d1b45933f237c724ee72c3b9 (diff) | |
| download | emacs-f1d34bcacd8dd9d730000f1fe8827559e1c89683.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-81
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-748
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-749
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-751
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-753
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-755
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-757
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-81
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82
Update from CVS
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fns.c b/src/fns.c index f7a6246d15d..1d23318fcd7 100644 --- a/src/fns.c +++ b/src/fns.c @@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA. */ #endif #include <time.h> -#ifndef MAC_OSX -/* On Mac OS X, defining this conflicts with precompiled headers. */ +#ifndef MAC_OS +/* On Mac OS, defining this conflicts with precompiled headers. */ /* Note on some machines this defines `vector' as a typedef, so make sure we don't use that name in this file. */ |