Mercurial > emacs
changeset 109652:eb720d8ea1c6
emacsclient.c cleanups.
* lib-src/emacsclient.c: Move socket related #includes together with the
rest of the #includes. Move a WINDOWSNT includes closer together.
(HAVE_CONFIG_H): Remove.
(NO_RETURN): Remove, defined in config.h.
(main): Convert definition to standard C.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 05 Aug 2010 21:09:54 -0700 |
| parents | b7f3d45194f6 |
| children | 9cfca8c9fb07 85236524c2a3 |
| files | lib-src/ChangeLog lib-src/emacsclient.c |
| diffstat | 2 files changed, 19 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Thu Aug 05 21:01:00 2010 -0700 +++ b/lib-src/ChangeLog Thu Aug 05 21:09:54 2010 -0700 @@ -1,3 +1,11 @@ +2010-08-06 Dan Nicolaescu <dann@ics.uci.edu> + + * emacsclient.c: Move socket related #includes together with the + rest of the #includes. Move a WINDOWSNT includes closer together. + (HAVE_CONFIG_H): Remove. + (NO_RETURN): Remove, defined in config.h. + (main): Convert definition to standard C. + 2010-07-29 Juanma Barranquero <lekktu@gmail.com> * make-docfile.c (write_c_args): Warn for old-style empty arglist ().
--- a/lib-src/emacsclient.c Thu Aug 05 21:01:00 2010 -0700 +++ b/lib-src/emacsclient.c Thu Aug 05 21:09:54 2010 -0700 @@ -18,9 +18,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif #ifdef WINDOWSNT @@ -32,6 +30,8 @@ # include <stdlib.h> # include <windows.h> # include <commctrl.h> +# include <io.h> +# include <winsock2.h> # define NO_SOCKETS_IN_FILE_SYSTEM @@ -45,8 +45,12 @@ # ifdef HAVE_INET_SOCKETS # include <netinet/in.h> +# ifdef HAVE_SOCKETS +# include <sys/types.h> +# include <sys/socket.h> +# include <sys/un.h> +# endif /* HAVE_SOCKETS */ # endif - # include <arpa/inet.h> # define INVALID_SOCKET -1 @@ -67,19 +71,15 @@ #include <stdio.h> #include "getopt.h" #ifdef HAVE_UNISTD_H -#include <unistd.h> +# include <unistd.h> #endif -#ifdef WINDOWSNT -# include <io.h> -#else /* not WINDOWSNT */ -# include <pwd.h> -#endif /* not WINDOWSNT */ +#include <pwd.h> #include <sys/stat.h> - #include <signal.h> #include <errno.h> + char *getenv (const char *), *getwd (char *); #ifdef HAVE_GETCWD @@ -114,10 +114,6 @@ #define TRUE 1 #endif -#ifndef NO_RETURN -#define NO_RETURN -#endif - /* Additional space when allocating buffers for filenames, etc. */ #define EXTRA_SPACE 100 @@ -702,9 +698,7 @@ #if !defined (HAVE_SOCKETS) || !defined (HAVE_INET_SOCKETS) int -main (argc, argv) - int argc; - char **argv; +main (int argc, char **argv) { main_argv = argv; progname = argv[0]; @@ -716,14 +710,6 @@ #else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */ -#ifdef WINDOWSNT -# include <winsock2.h> -#else -# include <sys/types.h> -# include <sys/socket.h> -# include <sys/un.h> -#endif - #define AUTH_KEY_LENGTH 64 #define SEND_BUFFER_SIZE 4096