diff options
| author | Eli Zaretskii | 2002-04-19 10:11:57 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2002-04-19 10:11:57 +0000 |
| commit | ec07b63d6f2eba4ea4c312ddd1a06c8414f2db42 (patch) | |
| tree | 137e9117f9dc643d4ea30bcab1a1974b0f3a202a /src | |
| parent | 6d912ee1a79392e3fcfa4f7932b0587560e2bfb6 (diff) | |
| download | emacs-ec07b63d6f2eba4ea4c312ddd1a06c8414f2db42.tar.gz emacs-ec07b63d6f2eba4ea4c312ddd1a06c8414f2db42.zip | |
(bcopy, bzero, bcmp): Define only if HAVE_BCOPY is not defined.
Diffstat (limited to 'src')
| -rw-r--r-- | src/s/sol2-5.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/s/sol2-5.h b/src/s/sol2-5.h index 9931e97d375..6a7a550c956 100644 --- a/src/s/sol2-5.h +++ b/src/s/sol2-5.h | |||
| @@ -24,6 +24,18 @@ | |||
| 24 | 24 | ||
| 25 | #undef USE_MMAP_FOR_BUFFERS | 25 | #undef USE_MMAP_FOR_BUFFERS |
| 26 | 26 | ||
| 27 | /* Newer versions of Solaris have bcopy etc. as functions, with | ||
| 28 | prototypes in strings.h. They lose if the defines from usg5-4.h | ||
| 29 | are visible, which happens when X headers are included. */ | ||
| 30 | #ifdef HAVE_BCOPY | ||
| 31 | #undef bcopy | ||
| 32 | #undef bzero | ||
| 33 | #undef bcmp | ||
| 34 | #ifndef NOT_C_CODE | ||
| 35 | #include <strings.h> | ||
| 36 | #endif | ||
| 37 | #endif | ||
| 38 | |||
| 27 | #if 0 /* A recent patch in unexelf.c should eliminate the need for this. */ | 39 | #if 0 /* A recent patch in unexelf.c should eliminate the need for this. */ |
| 28 | /* Don't use the shared libraries for -lXt and -lXaw, | 40 | /* Don't use the shared libraries for -lXt and -lXaw, |
| 29 | to work around a linker bug in Solaris 2.5. | 41 | to work around a linker bug in Solaris 2.5. |