these are libs, revert to compiler standard defs

diff --git a/lib/libRTV/rtv.h b/lib/libRTV/rtv.h
index bce843c..8edaf99 100644 (file)
--- a/lib/libRTV/rtv.h
+++ b/lib/libRTV/rtv.h
@@ -39,7 +39,7 @@ typedef unsigned __int64   u64;
 typedef          __int64   s64;
 #define U64F "I64"
 #endif
-#ifdef _LINUX
+#ifndef _WIN32
 typedef unsigned long long u64;
 typedef signed long long s64;
 #define U64F "l"

diff --git a/lib/libXDAAP/private.h b/lib/libXDAAP/private.h
index 61db83c..966741c 100644 (file)
--- a/lib/libXDAAP/private.h
+++ b/lib/libXDAAP/private.h
@@ -61,11 +61,6 @@ struct DAAP_SClientTAG
 #endif
 
     HTTP_ConnectionWatch *update_watch;
-
-#if !defined(WIN32) && !defined(_LINUX)
-  // why is this here?
-       SDiscover *discover;
-#endif
 };
 
 typedef struct
@@ -133,14 +128,14 @@ struct SDiscoverTAG
                                      and tests it for death */
     ts_mutex mtWorkerLock;
 
-#ifndef _LINUX
+#ifdef _WIN32
     fnDiscUpdated pfnUpdateCallback;
 #endif
     void *pvCallbackArg;
 
     struct CP_SThreadPool *tp;
 
-#ifndef _LINUX
+#ifdef _WIN32
     mdnsd mdnsd_info;
 #endif
     int socket;
@@ -149,7 +144,7 @@ struct SDiscoverTAG
     // answers
     /* answers */
     int pending_hosts;
-#ifndef _LINUX
+#ifdef _WIN32
     SDiscover_HostList *prenamed;
     SDiscover_HostList *pending;
     SDiscover_HostList *have;