Skip to content

Commit 877ba7a

Browse files
committed
live555: move the compat macro to header
the typedef is needed in BasicRTSPOnlyServer.cpp as well
1 parent 3af5f4d commit 877ba7a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/rtsp/BasicRTSPOnlyServer.hh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* Gerard Castillo <[email protected]>
55
*
66
* Copyright (c) 2005-2010 Fundació i2CAT, Internet I Innovació Digital a Catalunya
7+
* Copyright (c) 2019-2025 CESNET
78
*
89
* Redistribution and use in source and binary forms, with or without
910
* modification, is permitted provided that the following conditions
@@ -50,6 +51,11 @@
5051

5152
#include "c_basicRTSPOnlyServer.h" // for rtsp_server_parameters
5253

54+
// compat
55+
#if BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT < 1752883200
56+
typedef char volatile EventLoopWatchVariable;
57+
#endif
58+
5359
class BasicRTSPOnlyServer {
5460
private:
5561
BasicRTSPOnlyServer(struct rtsp_server_parameters params);

src/rtsp/c_basicRTSPOnlyServer.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@
4848
#include "rtsp/c_basicRTSPOnlyServer.h"
4949
#include "rtsp/BasicRTSPOnlyServer.hh"
5050

51-
// compat
52-
#if BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT < 1752883200
53-
typedef char volatile EventLoopWatchVariable;
54-
#endif
55-
5651
struct rtsp_serv {
5752
struct rtsp_server_parameters params;
5853
pthread_t server_th;

0 commit comments

Comments
 (0)