diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2006-10-31 09:08:24 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2006-10-31 09:08:24 +0000 |
| commit | e35fc9628ced2eafed2073622bbab1eec010d82a (patch) | |
| tree | bbd6f6e11d21184659ba51efbebe0dfdbde82fff /lib-src/emacsclient.c | |
| parent | 6ceb8058570a0be21df9bde80d2ee269bdf7291a (diff) | |
Fixes to emacsclient.c for GNU/Linux.
[!WINDOWSNT] <top level>: Include <netinet/in.h> and <sys/ioctl.h>.
(INVALID_SOCKET): Define.
(initialize_sockets): Put #endif at the right place.
(set_local_socket): Use progname, not argv[0].
Diffstat (limited to 'lib-src/emacsclient.c')
| -rw-r--r-- | lib-src/emacsclient.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 943053b3c0..b3a5180653 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -38,6 +38,9 @@ Boston, MA 02110-1301, USA. */ # define INITIALIZE() (initialize_sockets ()) typedef unsigned long IOCTL_BOOL_ARG; #else +# include <netinet/in.h> +# include <sys/ioctl.h> +# define INVALID_SOCKET -1 # define HSOCKET int # define CLOSE_SOCKET close # define IOCTL ioctl @@ -390,8 +393,8 @@ void initialize_sockets () } atexit (close_winsock); -#endif /* WINDOWSNT */ } +#endif /* WINDOWSNT */ /* * Read the information needed to set up a TCP comm channel with @@ -618,7 +621,7 @@ set_local_socket () we are root. */ if (0 != geteuid ()) { - fprintf (stderr, "%s: Invalid socket owner\n", argv[0]); + fprintf (stderr, "%s: Invalid socket owner\n", progname); return INVALID_SOCKET; } break; |