[core] Move SRT_API definition to srt.h

Add srt.h include where needed
Haivision · Mar 5, 2024 · eec3cda · eec3cda
1 parent 314606f
commit eec3cda
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/srtcore/channel.cpp b/srtcore/channel.cpp
@@ -51,6 +51,7 @@ modified by
 *****************************************************************************/
 
 #include "platform_sys.h"
+#include <srt.h>
 #include <iostream>
 #include <iomanip> // Logging
 #include <srt_compat.h>

diff --git a/srtcore/platform_sys.h b/srtcore/platform_sys.h
@@ -21,7 +21,6 @@
 //
 // SRT_IMPORT_TIME   (mach time on Mac, portability gettimeofday on WIN32)
 // SRT_IMPORT_EVENT  (includes kevent on Mac)
-#ifndef SRT_API
 #ifdef _WIN32
    #ifndef __MINGW32__
       // Explicitly define 32-bit and 64-bit numbers
@@ -35,18 +34,6 @@
          typedef __int64 uint64_t;
       #endif
    #endif
-   #ifdef SRT_DYNAMIC
-      #ifdef SRT_EXPORTS
-         #define SRT_API __declspec(dllexport)
-      #else
-         #define SRT_API __declspec(dllimport)
-      #endif
-   #else // !SRT_DYNAMIC
-      #define SRT_API
-   #endif
-#else
-   #define SRT_API __attribute__ ((visibility("default")))
-#endif
 #endif
 
 

diff --git a/srtcore/srt.h b/srtcore/srt.h
@@ -16,6 +16,21 @@ written by
 #ifndef INC_SRTC_H
 #define INC_SRTC_H
 
+#ifndef SRT_API
+
+   #ifdef SRT_DYNAMIC
+      #ifdef SRT_EXPORTS
+         #define SRT_API __declspec(dllexport)
+      #else
+         #define SRT_API __declspec(dllimport)
+      #endif
+   #else // !SRT_DYNAMIC
+      #define SRT_API
+   #endif
+#else
+   #define SRT_API __attribute__ ((visibility("default")))
+#endif
+
 #include "version.h"
 
 #include "platform_sys.h"

diff --git a/srtcore/srt_compat.c b/srtcore/srt_compat.c
@@ -17,6 +17,7 @@ written by
 // Prevents from misconfiguration through preprocessor.
 
 #include "platform_sys.h"
+#include <srt.h>
 #include <srt_compat.h>
 
 #include <string.h>