MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-01 18:21:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for linux

Browse Source
This commit is contained in:
Ron Pedde 2003-11-03 19:02:00 +00:00
parent c0cb4d6417
commit c758c1078e
5 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -16,6 +16,8 @@ AC_ARG_ENABLE(debug,Enable debugging features,CPPFLAGS="$CPPFLAGS -DDEBUG -g")
dnl Darwin's stupid cpp preprocessor.... dnl Darwin's stupid cpp preprocessor....
echo Host type is $host echo Host type is $host
case $host in case $host in
*linux*)
CPPFLAGS="$CPPFLAGS -DHAVE_SOCKLEN_T";;
*darwin*) *darwin*)
CPPFLAGS="$CPPFLAGS -no-cpp-precomp -DHAVE_SOCKADDR_SA_LEN -DHAVE_SOCKLEN_T";; CPPFLAGS="$CPPFLAGS -no-cpp-precomp -DHAVE_SOCKADDR_SA_LEN -DHAVE_SOCKLEN_T";;
esac esac

22
src/Makefile
View File

@ -38,13 +38,13 @@ pkglibdir = $(libdir)/mt-daapd
pkgincludedir = $(includedir)/mt-daapd pkgincludedir = $(includedir)/mt-daapd
top_builddir = .. top_builddir = ..
ACLOCAL = aclocal-1.6 ACLOCAL = ${SHELL} /home/ron/working/mt-daapd/missing --run aclocal-1.6
AUTOCONF = autoconf AUTOCONF = ${SHELL} /home/ron/working/mt-daapd/missing --run autoconf
AUTOMAKE = automake-1.6 AUTOMAKE = ${SHELL} /home/ron/working/mt-daapd/missing --run automake-1.6
AUTOHEADER = autoheader AUTOHEADER = ${SHELL} /home/ron/working/mt-daapd/missing --run autoheader
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /sw/bin/install -c INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL} INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA = ${INSTALL} -m 644
install_sh_DATA = $(install_sh) -c -m 644 install_sh_DATA = $(install_sh) -c -m 644
@ -60,13 +60,13 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = : PRE_UNINSTALL = :
POST_UNINSTALL = : POST_UNINSTALL = :
host_alias = host_alias =
host_triplet = powerpc-apple-darwin7.0.0 host_triplet = i686-pc-linux-gnu
EXEEXT = EXEEXT =
OBJEXT = o OBJEXT = o
PATH_SEPARATOR = : PATH_SEPARATOR = :
AMTAR = tar AMTAR = ${SHELL} /home/ron/working/mt-daapd/missing --run tar
AWK = awk AWK = gawk
CC = gcc CC = gcc
DEPDIR = .deps DEPDIR = .deps
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
@ -76,7 +76,7 @@ VERSION = 0.1.0
V_NETLIBS = V_NETLIBS =
am__include = include am__include = include
am__quote = am__quote =
install_sh = /Users/ron/Documents/School/cs4953 - Concurrency/mt-daapd/install-sh install_sh = /home/ron/working/mt-daapd/install-sh
# $Id$ # $Id$
# #
@ -106,8 +106,8 @@ mt_daapd_LDFLAGS =
DEFS = -DHAVE_CONFIG_H DEFS = -DHAVE_CONFIG_H
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = -DDEBUG -g -no-cpp-precomp -DHAVE_SOCKADDR_SA_LEN -DHAVE_SOCKLEN_T CPPFLAGS = -DDEBUG -g -DHAVE_SOCKLEN_T
LDFLAGS = -lpthread -lz LDFLAGS = -lpthread
LIBS = LIBS =
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles

9
src/daap-proto.c
View File

@ -313,8 +313,10 @@ int daap_serialize(DAAP_BLOCK *root, int fd, int gzip) {
return -1; return -1;
} }
/*
err=daap_compress(uncompressed,uncompressed_len, err=daap_compress(uncompressed,uncompressed_len,
compressed, &compressed_len); compressed, &compressed_len);
*/
if(err) { if(err) {
DPRINTF(ERR_INFO,"Error compressing: %s\n",strerror(errno)); DPRINTF(ERR_INFO,"Error compressing: %s\n",strerror(errno));
@ -354,7 +356,12 @@ int daap_serialize(DAAP_BLOCK *root, int fd, int gzip) {
* in a critical section. Someone with more knowledge of zlib * in a critical section. Someone with more knowledge of zlib
* than I can determine if it is really necessary. * than I can determine if it is really necessary.
* *
* This doesn't actually do gzip encoding -- it does a full
* gzip-style file, including header info. This is not what
* we want
*/ */
/*
int daap_compress(char *input, long in_len, char *output, long *out_len) { int daap_compress(char *input, long in_len, char *output, long *out_len) {
int err; int err;
@ -372,7 +379,7 @@ int daap_compress(char *input, long in_len, char *output, long *out_len) {
return (err == Z_OK ? 0 : -1); return (err == Z_OK ? 0 : -1);
} }
*/
/* /*
* daap_free * daap_free

3
src/main.c
View File

@ -23,11 +23,14 @@
# include "config.h" # include "config.h"
#endif #endif
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>

1
src/webserver.c
View File

@ -23,6 +23,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <pthread.h> #include <pthread.h>