Packman Build Service PMBS

File happy_gcc.diff of Package libliveMedia

--- a/liveMedia/RTSPClient.cpp
+++ b/liveMedia/RTSPClient.cpp
@@ -837,7 +837,7 @@ Boolean RTSPClient::checkForHeader(char
   // The line begins with the desired header name.  Trim off any whitespace, and return the header parameters:
   unsigned paramIndex = headerNameLength;
   while (line[paramIndex] != '\0' && (line[paramIndex] == ' ' || line[paramIndex] == '\t')) ++paramIndex;
-  if (&line[paramIndex] == '\0') return False; // the header is assumed to be bad if it has no parameters
+  if (line[paramIndex] == '\0') return False; // the header is assumed to be bad if it has no parameters
 
   headerParams = &line[paramIndex];
   return True;
--- a/liveMedia/include/RTSPClient.hh
+++ b/liveMedia/include/RTSPClient.hh
@@ -31,7 +31,10 @@ along with this library; if not, write t
 #include "DigestAuthentication.hh"
 #endif
 
-#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 // For now, continue to support the old synchronous interface as well
+#ifndef RTSPCLIENT_SYNCHRONOUS_INTERFACE
+// dvswitch/src/connector.cpp:16 also defines this before inclding RTSPClient.hh
+# define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 // For now, continue to support the old synchronous interface as well
+#endif
 
 class RTSPClient: public Medium {
 public: