Merge BUG: Windows target won't compile.
- winsock2.h must be included before windows.h
This commit is contained in:
parent
7be25714a7
commit
198a8abd87
@ -13,9 +13,8 @@
|
|||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
||||||
|
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
#include "my_global.h"
|
#include "my_global.h"
|
||||||
|
#include <windows.h>
|
||||||
#include "WindowsService.h"
|
#include "WindowsService.h"
|
||||||
|
|
||||||
static WindowsService *gService;
|
static WindowsService *gService;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user