diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-03-15 23:31:02 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-03-15 23:31:02 +0000 |
| commit | 46988b9257a03fbdf191305d5451ed9673c5c46b (patch) | |
| tree | a318de1529d42ceeeca2c2739eb26039b6d43cde /lib-src | |
| parent | e7eebcc5938dda49fa12dcb19ece216dcf1d2a13 (diff) | |
| download | emacs-46988b9257a03fbdf191305d5451ed9673c5c46b.tar.gz | |
Use BSD sockets whenever available, even if HAVE_SYSVIPC.
(main): Use getcwd if not BSD.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/emacsclient.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 2a48a5022d1..98fd8a24aa6 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -42,7 +42,7 @@ main (argc, argv) #else /* HAVE_SOCKETS or HAVE_SYSVIPC */ -#if ! defined (HAVE_SYSVIPC) +#if defined (HAVE_SOCKETS) /* BSD code is very different from SYSV IPC code */ #include <sys/types.h> @@ -135,7 +135,11 @@ main (argc, argv) exit (1); } +#ifdef BSD cwd = getwd (string); +#else + cwd = getcwd (string, sizeof string); +#endif if (cwd == 0) { /* getwd puts message in STRING if it fails. */ |