Skip to content

Commit d04de85

Browse files
ttldtorttldtor
committed
DXFC-329
1 parent b7cfc38 commit d04de85

37 files changed

+1427
-1138
lines changed

‎samples/CandleSample/CandleSample.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@
1818
*/
1919

2020
#ifdef _WIN32
21-
# pragma warning(push)
22-
# pragma warning(disable : 5105)
21+
# if !defined(__MINGW32__)
22+
# pragma warning(push)
23+
# pragma warning(disable : 5105)
24+
# endif
2325
# include <Windows.h>
24-
# pragma warning(pop)
26+
# if !defined(__MINGW32__)
27+
# pragma warning(pop)
28+
# endif
2529
#else
2630
# include <unistd.h>
2731
# include <string.h>
@@ -37,7 +41,7 @@
3741
#include "DXErrorCodes.h"
3842
#include "DXFeed.h"
3943

40-
#define true 1
44+
#define true 1
4145
#define false 0
4246

4347
// plus the name of the executable

‎samples/CommandLineSample/CommandLineSample.c‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@
2424
#endif
2525

2626
#ifdef _WIN32
27-
# pragma warning(push)
28-
# pragma warning(disable : 5105)
27+
# if !defined(__MINGW32__)
28+
# pragma warning(push)
29+
# pragma warning(disable : 5105)
30+
# endif
2931
# include <Windows.h>
30-
# pragma warning(pop)
32+
# if !defined(__MINGW32__)
33+
# pragma warning(pop)
34+
# endif
3135
#else
3236
# include <stdlib.h>
3337
# include <string.h>
@@ -166,7 +170,7 @@ int dxs_mutex_unlock(dxs_mutex_t* mutex) {
166170
#define LOG_DATA_TRANSFER_TAG "-p"
167171
#define TIMEOUT_TAG "-o"
168172
#define LOG_HEARTBEAT_TAG "-b"
169-
#define RECONNECT_TAG "-r"
173+
#define RECONNECT_TAG "-r"
170174

171175
// Prevents file names globbing (converting * to all files in the current dir)
172176
#ifdef __MINGW64_VERSION_MAJOR
@@ -619,8 +623,8 @@ int main(int argc, char* argv[]) {
619623
"[" DUMP_PARAM_LONG_TAG " | " DUMP_PARAM_SHORT_TAG " <filename>] [" TOKEN_PARAM_SHORT_TAG
620624
" <token>] "
621625
"[" SUBSCRIPTION_DATA_PARAM_TAG " <subscr_data>] [" LOG_DATA_TRANSFER_TAG "] [" TIMEOUT_TAG
622-
" <timeout>] [" LOG_HEARTBEAT_TAG
623-
"] [" RECONNECT_TAG "]\n"
626+
" <timeout>] [" LOG_HEARTBEAT_TAG "] [" RECONNECT_TAG
627+
"]\n"
624628
" <server address> - The DXFeed server address, e.g. demo.dxfeed.com:7300\n"
625629
" If you want to use file instead of server data just\n"
626630
" write there path to file e.g. path\\to\\raw.bin\n"
@@ -730,7 +734,7 @@ int main(int argc, char* argv[]) {
730734
}
731735

732736
dxf_initialize_logger_v2("command-line-api.log", true, true, true, log_data_transfer_flag);
733-
//dxf_load_config_from_string("network.heartbeatTimeout = 11\n");
737+
// dxf_load_config_from_string("network.heartbeatTimeout = 11\n");
734738

735739
wprintf(L"Command line sample started.\n");
736740
wprintf(L"Connecting to host %hs...\n", dxfeed_host);

‎samples/FullOrderBookSample/FullOrderBookSample.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@
1818
*/
1919

2020
#ifdef _WIN32
21-
# pragma warning(push)
22-
# pragma warning(disable : 5105)
21+
# if !defined(__MINGW32__)
22+
# pragma warning(push)
23+
# pragma warning(disable : 5105)
24+
# endif
2325
# include <Windows.h>
24-
# pragma warning(pop)
26+
# if !defined(__MINGW32__)
27+
# pragma warning(pop)
28+
# endif
2529
#else
2630

2731
# include <unistd.h>
@@ -65,7 +69,7 @@ typedef LPCRITICAL_SECTION dxs_mutex_t;
6569
#define LS2(s) L##s
6670

6771
#ifndef true
68-
# define true 1
72+
# define true 1
6973
# define false 0
7074
#endif
7175

‎samples/IncSnapshotConsoleSample/IncSnapshotConsoleSample.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@
1818
*/
1919

2020
#ifdef _WIN32
21-
# pragma warning(push)
22-
# pragma warning(disable : 5105)
21+
# if !defined(__MINGW32__)
22+
# pragma warning(push)
23+
# pragma warning(disable : 5105)
24+
# endif
2325
# include <Windows.h>
24-
# pragma warning(pop)
26+
# if !defined(__MINGW32__)
27+
# pragma warning(pop)
28+
# endif
2529
#else
2630
# include <stdlib.h>
2731
# include <string.h>
@@ -46,7 +50,7 @@
4650

4751
#ifndef true
4852

49-
# define true 1
53+
# define true 1
5054
# define false 0
5155
#endif
5256

‎samples/PriceLevelBookSample/PriceLevelBookSample.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@
1818
*/
1919

2020
#ifdef _WIN32
21-
# pragma warning(push)
22-
# pragma warning(disable : 5105)
21+
# if !defined(__MINGW32__)
22+
# pragma warning(push)
23+
# pragma warning(disable : 5105)
24+
# endif
2325
# include <Windows.h>
24-
# pragma warning(pop)
26+
# if !defined(__MINGW32__)
27+
# pragma warning(pop)
28+
# endif
2529
#else
2630
# include <unistd.h>
2731
# include <string.h>

‎samples/PriceLevelBookSample2/PriceLevelBookSample2.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@
1818
*/
1919

2020
#ifdef _WIN32
21-
# pragma warning(push)
22-
# pragma warning(disable : 5105)
21+
# if !defined(__MINGW32__)
22+
# pragma warning(push)
23+
# pragma warning(disable : 5105)
24+
# endif
2325
# include <Windows.h>
24-
# pragma warning(pop)
26+
# if !defined(__MINGW32__)
27+
# pragma warning(pop)
28+
# endif
2529
#else
2630
# include <unistd.h>
2731
# include <string.h>

‎samples/RegionalBookSample/RegionalBookSample.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@
1818
*/
1919

2020
#ifdef _WIN32
21-
# pragma warning(push)
22-
# pragma warning(disable : 5105)
21+
# if !defined(__MINGW32__)
22+
# pragma warning(push)
23+
# pragma warning(disable : 5105)
24+
# endif
2325
# include <Windows.h>
24-
# pragma warning(pop)
26+
# if !defined(__MINGW32__)
27+
# pragma warning(pop)
28+
# endif
2529
#else
2630
# include <unistd.h>
2731
# include <string.h>

‎samples/SnapshotConsoleSample/SnapshotConsoleSample.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,14 @@ typedef struct {
5555
pthread_mutexattr_t attr;
5656
} dxs_mutex_t;
5757
#else /* !defined(_WIN32) || defined(USE_PTHREADS) */
58-
# pragma warning(push)
59-
# pragma warning(disable : 5105)
58+
# if !defined(__MINGW32__)
59+
# pragma warning(push)
60+
# pragma warning(disable : 5105)
61+
# endif
6062
# include <Windows.h>
61-
# pragma warning(pop)
63+
# if !defined(__MINGW32__)
64+
# pragma warning(pop)
65+
# endif
6266
# define USE_WIN32_THREADS
6367
typedef HANDLE dxs_thread_t;
6468
typedef DWORD dxs_key_t;

‎src/DXAlgorithms.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@
1818
*/
1919

2020
#ifdef _WIN32
21-
# pragma warning(push)
22-
# pragma warning(disable : 5105)
21+
# if !defined(__MINGW32__)
22+
# pragma warning(push)
23+
# pragma warning(disable : 5105)
24+
# endif
2325
# include <Windows.h>
24-
# pragma warning(pop)
26+
# if !defined(__MINGW32__)
27+
# pragma warning(pop)
28+
# endif
2529
#else
2630
# include <time.h>
2731
# include <stdlib.h>

‎src/DXErrorHandling.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@
2222
*/
2323

2424
#ifdef _WIN32
25-
# pragma warning(push)
26-
# pragma warning(disable : 5105)
25+
# if !defined(__MINGW32__)
26+
# pragma warning(push)
27+
# pragma warning(disable : 5105)
28+
# endif
2729
# include <Windows.h>
28-
# pragma warning(pop)
30+
# if !defined(__MINGW32__)
31+
# pragma warning(pop)
32+
# endif
2933
#endif /* _WIN32 */
3034

3135
#include "DXErrorHandling.h"

0 commit comments

Comments
 (0)