fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better fix for MSVC.

Browse source
This commit is contained in:
XMRig 2017-08-17 07:33:21 +03:00
parent e3dd4a6581
commit fc1d6c7e84
7 changed files with 50 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/3rdparty/jansson/dump.c vendored
View file

@ -20,13 +20,10 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#if defined(HAVE_UNISTD_H) && !defined(_MSC_VER) #if defined(HAVE_UNISTD_H)
#include <unistd.h> # include <unistd.h>
#endif #elif defined(_MSC_VER)
# include <io.h>
#if defined(_MSC_VER)
#include <BaseTsd.h>
typedef SSIZE_T ssize_t;
#endif #endif
#include "jansson.h" #include "jansson.h"
@ -72,10 +69,13 @@ static int dump_to_file(const char *buffer, size_t size, void *data)
static int dump_to_fd(const char *buffer, size_t size, void *data) static int dump_to_fd(const char *buffer, size_t size, void *data)
{ {
int *dest = (int *)data; int *dest = (int *)data;
#ifdef HAVE_UNISTD_H # if defined(HAVE_UNISTD_H)
if(write(*dest, buffer, size) == (ssize_t)size) if(write(*dest, buffer, size) == (ssize_t)size)
return 0; return 0;
#endif # elif (defined(_MSC_VER))
if (write(*dest, buffer, (unsigned int) size) == (int) size)
return 0;
# endif
return -1; return -1;
} }

2
src/3rdparty/jansson/hashtable_seed.c vendored
View file

@ -21,7 +21,7 @@
#include <sched.h> #include <sched.h>
#endif #endif
#if defined(HAVE_UNISTD_H) && !defined(_MSC_VER) #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif

4
src/3rdparty/jansson/jansson_private_config.h vendored
View file

@ -92,7 +92,9 @@
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1 #ifndef _MSC_VER
# define HAVE_UNISTD_H 1
#endif
/* Define to 1 if the system has the type 'unsigned long long int'. */ /* Define to 1 if the system has the type 'unsigned long long int'. */
#define HAVE_UNSIGNED_LONG_LONG_INT 1 #define HAVE_UNSIGNED_LONG_LONG_INT 1

12
src/3rdparty/jansson/load.c vendored
View file

@ -18,12 +18,12 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#if defined(HAVE_UNISTD_H) && !defined(_MSC_VER) #if defined(HAVE_UNISTD_H)
#include <unistd.h> # include <unistd.h>
#endif #elif defined(_MSC_VER)
# include <io.h>
#ifdef _MSC_VER # define HAVE_UNISTD_H
#define STDIN_FILENO 0 # define STDIN_FILENO 0
#endif #endif
#include "jansson.h" #include "jansson.h"

14
src/Platform_mac.cpp
View file

@ -30,13 +30,23 @@
#include "Platform.h" #include "Platform.h"
#include "version.h" #include "version.h"
#ifdef XMRIG_NVIDIA_PROJECT
# include "nvidia/cryptonight.h"
#endif
static inline char *createUserAgent() static inline char *createUserAgent()
{ {
const size_t max = 128; const size_t max = 160;
char *buf = new char[max]; char *buf = new char[max];
snprintf(buf, max, "%s/%s (Macintosh; Intel Mac OS X) libuv/%s clang/%d.%d.%d", APP_NAME, APP_VERSION, uv_version_string(), __clang_major__, __clang_minor__, __clang_patchlevel__);
# ifdef XMRIG_NVIDIA_PROJECT
const int cudaVersion = cuda_get_runtime_version();
snprintf(buf, max, "%s/%s (Macintosh; Intel Mac OS X) libuv/%s CUDA/%d.%d clang/%d.%d.%d", APP_NAME, APP_VERSION, uv_version_string(), cudaVersion / 1000, cudaVersion % 100, __clang_major__, __clang_minor__, __clang_patchlevel__);
# else
snprintf(buf, max, "%s/%s (Macintosh; Intel Mac OS X) libuv/%s clang/%d.%d.%d", APP_NAME, APP_VERSION, uv_version_string(), __clang_major__, __clang_minor__, __clang_patchlevel__);
# endif
return buf; return buf;
} }

11
src/Platform_unix.cpp
View file

@ -32,10 +32,14 @@
#include "Platform.h" #include "Platform.h"
#include "version.h" #include "version.h"
#ifdef XMRIG_NVIDIA_PROJECT
# include "nvidia/cryptonight.h"
#endif
static inline char *createUserAgent() static inline char *createUserAgent()
{ {
const size_t max = 128; const size_t max = 160;
char *buf = new char[max]; char *buf = new char[max];
int length = snprintf(buf, max, "%s/%s (Linux ", APP_NAME, APP_VERSION); int length = snprintf(buf, max, "%s/%s (Linux ", APP_NAME, APP_VERSION);
@ -46,6 +50,11 @@ static inline char *createUserAgent()
length += snprintf(buf + length, max - length, "i686) libuv/%s", uv_version_string()); length += snprintf(buf + length, max - length, "i686) libuv/%s", uv_version_string());
# endif # endif
# ifdef XMRIG_NVIDIA_PROJECT
const int cudaVersion = cuda_get_runtime_version();
length += snprintf(buf + length, max - length, " CUDA/%d.%d", cudaVersion / 1000, cudaVersion % 100);
# endif
# ifdef __GNUC__ # ifdef __GNUC__
length += snprintf(buf + length, max - length, " gcc/%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__); length += snprintf(buf + length, max - length, " gcc/%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
# endif # endif

9
src/Platform_win.cpp
View file

@ -30,6 +30,10 @@
#include "Platform.h" #include "Platform.h"
#include "version.h" #include "version.h"
#ifdef XMRIG_NVIDIA_PROJECT
# include "nvidia/cryptonight.h"
#endif
static inline OSVERSIONINFOEX winOsVersion() static inline OSVERSIONINFOEX winOsVersion()
{ {
@ -63,6 +67,11 @@ static inline char *createUserAgent()
length += snprintf(buf + length, max - length, ") libuv/%s", uv_version_string()); length += snprintf(buf + length, max - length, ") libuv/%s", uv_version_string());
# endif # endif
# ifdef XMRIG_NVIDIA_PROJECT
const int cudaVersion = cuda_get_runtime_version();
length += snprintf(buf + length, max - length, " CUDA/%d.%d", cudaVersion / 1000, cudaVersion % 100);
# endif
# ifdef __GNUC__ # ifdef __GNUC__
length += snprintf(buf + length, max - length, " gcc/%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__); length += snprintf(buf + length, max - length, " gcc/%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
# elif _MSC_VER # elif _MSC_VER