GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-31 08:54:19 +00:00
Code Issues Releases Wiki Activity

build/mingw: style fixup after tonobitc merge.

Browse Source 
Use `#defined(...)` instead of `#defined ...`.

Remove comments about issues - anyone removing those lines can check blame
to see why they were added.

Add tonobitc to AUTHORS.md.
This commit is contained in:
Noel Maersk 2014-01-29 22:25:38 +02:00
parent 241c94cbdd
commit ed61c38ec8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.md
View File

@ -25,6 +25,7 @@ updated by many others.
* Benjamin Herrenschmidt <ozbenh> * Benjamin Herrenschmidt <ozbenh>
* Joe4782 * Joe4782
* gacheson * gacheson
* tonobitc
...and many others. See: ...and many others. See:

2
compat.h
View File

@ -47,7 +47,7 @@ static inline int nanosleep(const struct timespec *req, struct timespec *rem)
} }
#endif #endif
#if defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR #if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
// Reported unneded in https://github.com/veox/sgminer/issues/37 */ // Reported unneded in https://github.com/veox/sgminer/issues/37 */
static inline int sleep(unsigned int secs) static inline int sleep(unsigned int secs)
{ {

4
sgminer.c
View File

@ -35,7 +35,7 @@
#ifndef WIN32 #ifndef WIN32
#include <sys/resource.h> #include <sys/resource.h>
#else #else
#include <winsock2.h> //before windows.h to resolve ws2tcpip.h conflict https://github.com/veox/sgminer/issues/12 #include <winsock2.h>
#include <windows.h> #include <windows.h>
#endif #endif
#include <ccan/opt/opt.h> #include <ccan/opt/opt.h>
@ -3044,7 +3044,7 @@ static void kill_mining(void)
if (thr && PTH(thr) != 0L) if (thr && PTH(thr) != 0L)
pth = &thr->pth; pth = &thr->pth;
thr_info_cancel(thr); thr_info_cancel(thr);
#if !defined WIN32 || defined __MINGW64_VERSION_MAJOR #if !defined(WIN32) || defined(__MINGW64_VERSION_MAJOR)
if (pth && *pth) if (pth && *pth)
pthread_join(*pth, NULL); pthread_join(*pth, NULL);
#else #else