patches/gmediaserver-02-solaris.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 340 eed15552a496
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
340
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     1
--- gmediaserver-0.12.0/src/interface.c.orig	2007-07-15 17:07:20.758352141 +0700
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     2
+++ gmediaserver-0.12.0/src/interface.c	2007-07-15 17:40:24.506612594 +0700
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     3
@@ -23,6 +23,9 @@
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     4
 #include <stdio.h>		/* C89 */
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     5
 #include <string.h>		/* C89 */
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     6
 #include <sys/socket.h>		/* POSIX */
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     7
+#ifdef sun
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     8
+#include <sys/sockio.h>
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
     9
+#endif
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    10
 #include <sys/ioctl.h>		/* ? */
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    11
 #include <sys/param.h>		/* ? */
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    12
 #include <net/if.h>		/* ? */
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    13
@@ -30,6 +33,9 @@
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    14
 #include <arpa/inet.h>		/* ? */
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    15
 #include "strnlen.h"		/* Gnulib */
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    16
 #include "gmediaserver.h"
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    17
+#ifdef sun
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    18
+#include "minmax.h"
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    19
+#endif
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    20
 
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    21
 char *
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    22
 get_ip_by_spec(char *spec)
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    23
--- gmediaserver-0.12.0/src/webclient.c.orig	2007-07-15 17:17:14.983125084 +0700
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    24
+++ gmediaserver-0.12.0/src/webclient.c	2007-07-15 17:17:34.303327717 +0700
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    25
@@ -371,7 +371,9 @@
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    26
     if (res == NULL || *res != '\0')
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    27
         return false;
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    28
 
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    29
+#ifndef sun
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    30
     tm.tm_zone = "GMT";
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    31
+#endif
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    32
     t = mktime(&tm);
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    33
     if (t == (time_t) -1)
eed15552a496 2007-07-15 Doug Scott <[email protected]>
drdoug007
parents:
diff changeset
    34
         return false;