diff --git a/src/presentation.c b/src/presentation.c index ce9d14f..cb24447 100644 --- a/src/presentation.c +++ b/src/presentation.c @@ -23,7 +23,8 @@ #if HAVE_LANGINFO_CODESET # include #endif - +#include +#include #include "config.h" #include "metadata.h" #include "content.h" diff --git a/src/trace.c b/src/trace.c index 09dbb86..39f2b8d 100644 --- a/src/trace.c +++ b/src/trace.c @@ -29,8 +29,7 @@ extern struct ushare_t *ut; -void -print_log (log_level level, const char *format, ...) +void print_log (log_level level, const char *format, ...) { va_list va; bool is_daemon = ut ? ut->daemon : false; @@ -57,8 +56,6 @@ print_log (log_level level, const char *format, ...) va_end (va); } -inline void -start_log (void) -{ +void start_log (void) { openlog (PACKAGE_NAME, LOG_PID, LOG_DAEMON); } diff --git a/src/trace.h b/src/trace.h index 7701507..1d0e9df 100644 --- a/src/trace.h +++ b/src/trace.h @@ -29,7 +29,7 @@ typedef enum { void print_log (log_level level, const char *format, ...) __attribute__ ((format (printf, 2, 3))); -inline void start_log (void); +void start_log (void); /* log_info * Normal print, to replace printf diff --git a/src/ushare.c b/src/ushare.c index 717e862..971c918 100644 --- a/src/ushare.c +++ b/src/ushare.c @@ -28,6 +28,7 @@ #include #include + #if (defined(BSD) || defined(__FreeBSD__) || defined(__APPLE__)) #include #include @@ -188,7 +189,7 @@ handle_action_request (struct Upnp_Action_Request *request) if (strcmp (request->DevUDN + 5, ut->udn)) return; - ip = request->CtrlPtIPAddr.s_addr; + ip = ((struct in_addr*)&request->CtrlPtIPAddr)->s_addr; ip = ntohl (ip); sprintf (val, "%d.%d.%d.%d", (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF); diff --git a/src/ushare.h b/src/ushare.h index 6256a27..3678068 100644 --- a/src/ushare.h +++ b/src/ushare.h @@ -127,6 +127,6 @@ struct action_event_t { struct service_t *service; }; -inline void display_headers (void); +void display_headers (void); #endif /* _USHARE_H_ */