Browse Source

Merge branch 'dev'

Paul-Louis Ageneau 5 years ago
parent
commit
858e181be1
3 changed files with 5 additions and 5 deletions
  1. 1 1
      README.md
  2. 1 1
      deps/libjuice
  3. 3 3
      include/rtc/rtc.h

+ 1 - 1
README.md

@@ -1,6 +1,6 @@
 # libdatachannel - C/C++ WebRTC Data Channels
 
-libdatachannel is a standalone implementation of WebRTC Data Channels and WebSockets in C++17 with C bindings for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows. It enables direct connectivity between native applications and web browsers without the pain of importing the entire WebRTC stack. The interface is modelled as simplified versions of the WebRTC JSEP API and the WebSocket JavaScript API present in browsers, in order to ease the design of cross-environment applications.
+libdatachannel is a standalone implementation of WebRTC Data Channels and WebSockets in C++17 with C bindings for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows. It enables direct connectivity between native applications and web browsers without the pain of importing the entire WebRTC stack. The interface consists of simplified versions of the JavaScript WebRTC and WebSocket APIs present in browsers, in order to ease the design of cross-environment applications.
 It can be compiled with multiple backends:
 - The security layer can be provided through [GnuTLS](https://www.gnutls.org/) or [OpenSSL](https://www.openssl.org/).
 - The connectivity for WebRTC can be provided through my ad-hoc ICE library [libjuice](https://github.com/paullouisageneau/libjuice) as submodule or through [libnice](https://github.com/libnice/libnice).

+ 1 - 1
deps/libjuice

@@ -1 +1 @@
-Subproject commit fc128c78310bc083a4ecc285dd4cbe0c7ed500ea
+Subproject commit 9d30cc985e0261e15b6aa419879b9b81dc8f420d

+ 3 - 3
include/rtc/rtc.h

@@ -60,9 +60,9 @@ typedef enum { // Don't change, it must match plog severity
 	RTC_LOG_VERBOSE = 6
 } rtcLogLevel;
 
-const int RTC_ERR_SUCCESS = 0;
-const int RTC_ERR_INVALID = -1; // invalid argument
-const int RTC_ERR_FAILURE = -2; // runtime error
+#define RTC_ERR_SUCCESS 0
+#define RTC_ERR_INVALID -1 // invalid argument
+#define RTC_ERR_FAILURE -2 // runtime error
 
 typedef struct {
 	const char **iceServers;