diff options
| author | David J. MacKenzie <djm@gnu.org> | 1995-07-26 17:54:50 +0000 |
|---|---|---|
| committer | David J. MacKenzie <djm@gnu.org> | 1995-07-26 17:54:50 +0000 |
| commit | aa42ddbe493986f54727866912103937eccbd01c (patch) | |
| tree | e8edb563298a4a5dd6ad41fb56e5d12d33144c86 /src/termcap.c | |
| parent | f4b728482eb09fbbc11e6e049014b90d77c06926 (diff) | |
| download | emacs-aa42ddbe493986f54727866912103937eccbd01c.tar.gz | |
Move #define of bcopy to after #include <string.h>.
Diffstat (limited to 'src/termcap.c')
| -rw-r--r-- | src/termcap.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/termcap.c b/src/termcap.c index bf16ed2824c..7be847503f0 100644 --- a/src/termcap.c +++ b/src/termcap.c @@ -1,5 +1,5 @@ /* Work-alike for termcap, plus extra features. - Copyright (C) 1985, 1986, 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1985, 86, 93, 94, 95 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,10 +28,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #else /* not HAVE_CONFIG_H */ -#if defined(HAVE_STRING_H) || defined(STDC_HEADERS) -#define bcopy(s, d, n) memcpy ((d), (s), (n)) -#endif - #ifdef STDC_HEADERS #include <stdlib.h> #include <string.h> @@ -41,6 +37,11 @@ char *malloc (); char *realloc (); #endif +/* Do this after the include, in case string.h prototypes bcopy. */ +#if (defined(HAVE_STRING_H) || defined(STDC_HEADERS)) && !defined(bcopy) +#define bcopy(s, d, n) memcpy ((d), (s), (n)) +#endif + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif |