michael@75: Index: src/interface.c michael@75: diff -Nau src/interface.c.orig src/interface.c michael@75: --- src/interface.c.orig 2005-09-10 09:25:40.000000000 +0200 michael@75: +++ src/interface.c 2006-10-30 23:18:46.644745000 +0100 michael@75: @@ -28,8 +28,19 @@ michael@75: #include /* ? */ michael@75: #include /* ? */ michael@75: #include /* ? */ michael@75: +#if (defined(sun) && defined(__svr4__)) michael@75: +#include michael@75: +#endif michael@75: #include "gmediaserver.h" michael@75: michael@75: +#ifndef MAX michael@75: +#define MAX(a,b) ((a) > (b) ? (a) : (b)) michael@75: +#endif michael@75: + michael@75: +#ifndef MIN michael@75: +#define MIN(a,b) ((a) < (b) ? (a) : (b)) michael@75: +#endif michael@75: + michael@75: char * michael@75: get_ip_by_spec(char *spec) michael@75: { michael@75: Index: src/metadata.c michael@75: diff -Nau src/metadata.c.orig src/metadata.c michael@75: --- src/metadata.c.orig 2007-02-27 14:10:38.630894000 +0100 michael@75: +++ src/metadata.c 2007-02-27 14:11:50.191849000 +0100 michael@75: @@ -1071,6 +1071,7 @@ michael@75: uint32_t c; michael@75: uint32_t child_count = 0; michael@75: michael@75: + root_entry = make_entry(ROOT_ENTRY_NAME, -1, true); michael@75: children = xmalloc(sizeof(int32_t) * pathc); michael@75: for (c = 0; c < pathc; c++) { michael@75: Entry *entry; michael@75: @@ -1088,13 +1089,12 @@ michael@75: free(tmp); michael@75: } michael@75: michael@75: - entry = scan_entry(pathv[c], name, -1, indent_size, NULL); michael@75: + entry = scan_entry(pathv[c], name, root_entry->id, indent_size, NULL); michael@75: if (entry != NULL) michael@75: children[child_count++] = entry->id; michael@75: free(name); michael@75: } michael@75: if (child_count != 0) { michael@75: - root_entry = make_entry(ROOT_ENTRY_NAME, -1, true); michael@75: detail = get_entry_detail(root_entry, DETAIL_CHILDREN); michael@75: detail->data.children.count = child_count; michael@75: detail->data.children.list = children; michael@75: Index: lib/Makefile.in michael@75: diff -Nau lib/Makefile.in.orig lib/Makefile.in michael@75: --- lib/Makefile.in.orig 2006-08-29 22:53:57.000000000 +0200 michael@75: +++ lib/Makefile.in 2006-11-01 10:25:38.000000000 +0100 michael@75: @@ -112,7 +112,16 @@ michael@75: full-write.$(OBJEXT) getnline.$(OBJEXT) progname.$(OBJEXT) \ michael@75: striconv.$(OBJEXT) version-etc.$(OBJEXT) xalloc-die.$(OBJEXT) \ michael@75: xgethostname.$(OBJEXT) xstrndup.$(OBJEXT) xvasprintf.$(OBJEXT) \ michael@75: - xasprintf.$(OBJEXT) michael@75: + xasprintf.$(OBJEXT) xmalloc.$(OBJEXT) quote.$(OBJEXT) error.$(OBJEXT) \ michael@75: + quotearg.$(OBJEXT) strftime.$(OBJEXT) \ michael@75: + strndup.$(OBJEXT) strnlen.$(OBJEXT) \ michael@75: + getopt.$(OBJEXT) getopt1.$(OBJEXT) \ michael@75: + basename.$(OBJEXT) dirname.$(OBJEXT) \ michael@75: + vasprintf.$(OBJEXT) vasnprintf.$(OBJEXT) \ michael@75: + full-read.$(OBJEXT) safe-read.$(OBJEXT) \ michael@75: + full-write.$(OBJEXT) safe-write.$(OBJEXT) \ michael@75: + printf-args.$(OBJEXT) printf-parse.$(OBJEXT) \ michael@75: + exitfail.$(OBJEXT) getndelim2.$(OBJEXT) sig2str.$(OBJEXT) michael@75: libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) michael@75: LTLIBRARIES = $(noinst_LTLIBRARIES) michael@75: DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) michael@75: @@ -553,7 +562,7 @@ michael@75: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) michael@75: libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) michael@75: -rm -f libgnu.a michael@75: - $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) michael@75: + $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) michael@75: $(RANLIB) libgnu.a michael@75: michael@75: clean-noinstLTLIBRARIES: