Re: [RFD] socklen_t needs to be defined and libssl to be linked on old Mac OS X

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On older Mac OS X (10.2.8), no socklen_t is defined, and therefore
> daemon.c does not compile. However, Mac OS X 10.4 seems to define
> socklen_t differently.
>
> Also, linking fails due to some symbols defined in libssl (not just
> libcrypto).

Hmph.  While I would want things to be portable, I prefer to
avoid platform specific #ifdef and conditional Makefile
constructs.

>    SHA1_HEADER=<openssl/sha.h>
> +ifeq ($(shell uname -s),Darwin)
> +  LIBS += -lcrypto -lssl
> +else
>    LIBS += -lcrypto
> +endif
>  endif
>  #include <arpa/inet.h>
> +#ifdef __APPLE__
> +typedef int socklen_t;
> +#endif

I'll keep this in the proposed updates queue until somebody
comes up with a bit cleaner solution.

By the way, Johannes, what mailer do you use?  Many of your
patches seem to be whitespace damaged.  For example:

> diff --git a/daemon.c b/daemon.c
> --- a/daemon.c
> +++ b/daemon.c
> @@ -5,6 +5,9 @@
>  #include <sys/socket.h>
>  #include <netinet/in.h>
>  #include <arpa/inet.h>
> +#ifdef __APPLE__
> +typedef int socklen_t;
> +#endif
>
>  static const char daemon_usage[] = "git-daemon [--inetd | --port=n]";

The empty line before daemon_usage[] line should start with a
single SP but your message does not seem to have it.  I double
checked with the copy marc has:

    http://marc.theaimsgroup.com/?l=git&m=112256286508546&q=raw

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html