File happy_gcc.diff of Package libliveMedia
26
1
--- a/liveMedia/RTSPClient.cpp
2
+++ b/liveMedia/RTSPClient.cpp
3
4
// The line begins with the desired header name. Trim off any whitespace, and return the header parameters:
5
unsigned paramIndex = headerNameLength;
6
while (line[paramIndex] != '\0' && (line[paramIndex] == ' ' || line[paramIndex] == '\t')) ++paramIndex;
7
- if (&line[paramIndex] == '\0') return False; // the header is assumed to be bad if it has no parameters
8
+ if (line[paramIndex] == '\0') return False; // the header is assumed to be bad if it has no parameters
9
10
headerParams = &line[paramIndex];
11
return True;
12
--- a/liveMedia/include/RTSPClient.hh
13
+++ b/liveMedia/include/RTSPClient.hh
14
15
#include "DigestAuthentication.hh"
16
#endif
17
18
-#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 // For now, continue to support the old synchronous interface as well
19
+#ifndef RTSPCLIENT_SYNCHRONOUS_INTERFACE
20
+// dvswitch/src/connector.cpp:16 also defines this before inclding RTSPClient.hh
21
+# define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 // For now, continue to support the old synchronous interface as well
22
+#endif
23
24
class RTSPClient: public Medium {
25
public:
26