diff options
| author | Richard M. Stallman | 1993-11-23 08:56:03 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-11-23 08:56:03 +0000 |
| commit | cd23c8dbd2e2f406ea58ac949fec3690ae6c6d8f (patch) | |
| tree | 3ffd754bd50c7bacd30376815e8884601f489f9e /src/s | |
| parent | 4897b0a059da3d102330ce5622f5cdd8dd56a0ae (diff) | |
| download | emacs-cd23c8dbd2e2f406ea58ac949fec3690ae6c6d8f.tar.gz emacs-cd23c8dbd2e2f406ea58ac949fec3690ae6c6d8f.zip | |
(HAVE_GETTIMEOFDAY): Define only if HAVE_SOCKETS.
Fix up conditionals changed recently.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/sco4.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/s/sco4.h b/src/s/sco4.h index dba7644429e..e3a93d90b16 100644 --- a/src/s/sco4.h +++ b/src/s/sco4.h | |||
| @@ -76,12 +76,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 76 | #ifdef HAVE_SOCKETS | 76 | #ifdef HAVE_SOCKETS |
| 77 | #define LIBS_SYSTEM -lsocket | 77 | #define LIBS_SYSTEM -lsocket |
| 78 | 78 | ||
| 79 | /* configure can't get this right since it comes from -lsocket | ||
| 80 | and configure doesn't know to look there. */ | ||
| 81 | #undef HAVE_XSCREENNUMBEROFSCREEN | ||
| 82 | #define HAVE_XSCREENNUMBEROFSCREEN | ||
| 83 | #endif | ||
| 84 | |||
| 85 | /* SCO has gettimeofday in socket library */ | 79 | /* SCO has gettimeofday in socket library */ |
| 86 | /* Autoconf should determine this, but for now, | 80 | /* Autoconf should determine this, but for now, |
| 87 | play safe to avoid error rather than deleting this | 81 | play safe to avoid error rather than deleting this |
| @@ -91,6 +85,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 91 | #endif | 85 | #endif |
| 92 | #endif | 86 | #endif |
| 93 | 87 | ||
| 88 | #ifdef HAVE_X11R5 | ||
| 89 | /* configure can't get this right linking fails unless -lsocket is used. */ | ||
| 90 | #undef HAVE_XSCREENNUMBEROFSCREEN | ||
| 91 | #define HAVE_XSCREENNUMBEROFSCREEN | ||
| 92 | #endif | ||
| 93 | |||
| 94 | /* We don't have -loldX, and we don't need it. */ | 94 | /* We don't have -loldX, and we don't need it. */ |
| 95 | #define LIB_XMENU_LIB | 95 | #define LIB_XMENU_LIB |
| 96 | 96 | ||