bug#1483: cleanup: replace NO_SOCKETS_IN_FILE_SYSTEM in emacsclient.c

[Dan Nicolaescu <dann@ics.uci.edu>]

"Juanma Barranquero" <lekktu@gmail.com> writes:

  > On Wed, Dec 3, 2008 at 16:24, Dan Nicolaescu <dann@ics.uci.edu> wrote:
  > 
  > > That's better than everyone else having to figure out the same thing
  > > until that hypothetical moment.
  > 
  > There's nothing to figure right now: NO_SOCKETS_IN_FILE_SYSTEM is
  > self-descriptive.

Code like this:
struct option longopts[] =
{
  { "no-wait",  no_argument,       NULL, 'n' },
  { "eval",     no_argument,          NULL, 'e' },
  { "help",     no_argument,             NULL, 'H' },
  { "version",  no_argument,                NULL, 'V' },
  { "tty",      no_argument,       NULL, 't' },
  { "nw",       no_argument,       NULL, 't' },
  { "create-frame", no_argument,   NULL, 'c' },
  { "alternate-editor", required_argument, NULL, 'a' },
  { "retry-with-daemon", no_argument, NULL, 't' },
#ifndef NO_SOCKETS_IN_FILE_SYSTEM
  { "socket-name",      required_argument, NULL, 's' },
#endif
  { "server-file",      required_argument, NULL, 'f' },
#ifndef WINDOWSNT
  { "display",  required_argument, NULL, 'd' },
#endif
  { 0, 0, 0, 0 }
};

should only need a single #ifdef.  


The clear precedent is that WINDOWSNT already encompasses a bazillion
features, why would a bazillion + 1 won't make any difference?  It would
make a difference for the vast majority of people that write to the
emacs repository, most do not use windows and can just ignore the #ifdef
WINDOWSNT code.

On a not so related note, why are there #includes on line 671 in
emacsclient.c instead of at the beginning of the file?