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 | ee6a193c4ca86a0066c47b65658ba33f643de03a (patch) | |
| tree | 8111ab8dfaf8b4d391fbc690a3f4fde5cdfe1414 /lib-src | |
| parent | ce27e1b0b3a2a54d577652416a368f871faece3d (diff) | |
| download | emacs-ee6a193c4ca86a0066c47b65658ba33f643de03a.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. */ |