Bläddra i källkod

atomic WSAStartup

ithewei 4 år sedan
förälder
incheckning
71a0854b39
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      Makefile
  2. 1 1
      base/hsocket.c

+ 1 - 1
Makefile

@@ -198,7 +198,7 @@ unittest: prepare
 	$(CXX) -g -Wall -O0 -std=c++11 -I. -Ibase -Icpputil  -o bin/threadpool_test   unittest/threadpool_test.cpp  -pthread
 	$(CXX) -g -Wall -O0 -std=c++11 -I. -Ibase -Icpputil  -o bin/objectpool_test   unittest/objectpool_test.cpp  -pthread
 	$(CXX) -g -Wall -O0 -std=c++11 -I. -Ibase -Issl -Ievent -Ievpp -Icpputil -Ihttp -Ihttp/client -Ihttp/server -o bin/sizeof_test unittest/sizeof_test.cpp
-	$(CC)  -g -Wall -O0 -std=c99   -I. -Ibase -Iprotocol -o bin/nslookup          unittest/nslookup_test.c      protocol/dns.c
+	$(CC)  -g -Wall -O0 -std=c99   -I. -Ibase -Iprotocol -o bin/nslookup          unittest/nslookup_test.c      protocol/dns.c  base/hsocket.c
 	$(CC)  -g -Wall -O0 -std=c99   -I. -Ibase -Iprotocol -o bin/ping              unittest/ping_test.c          protocol/icmp.c base/hsocket.c base/htime.c -DPRINT_DEBUG
 	$(CC)  -g -Wall -O0 -std=c99   -I. -Ibase -Iprotocol -o bin/ftp               unittest/ftp_test.c           protocol/ftp.c  base/hsocket.c
 	$(CC)  -g -Wall -O0 -std=c99   -I. -Ibase -Iprotocol -Iutil -o bin/sendmail   unittest/sendmail_test.c      protocol/smtp.c base/hsocket.c util/base64.c

+ 1 - 1
base/hsocket.c

@@ -4,7 +4,7 @@
 
 #ifdef OS_WIN
 #include "hatomic.h"
-static hatomic_flag s_wsa_initialized = HATOMIC_FLAG_INIT;
+static hatomic_flag_t s_wsa_initialized = HATOMIC_FLAG_INIT;
 void WSAInit() {
     if (!hatomic_flag_test_and_set(&s_wsa_initialized)) {
         WSADATA wsadata;