X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fcommon%2Fscpi_tcp.c;h=af2db140661ce99c04d77f79f92872723c4de8c5;hb=b76eca818a66c5bb5b409c44e46ac0f5d851b0ce;hp=8f4ea21dcdac8a844547c89dc6f68121e9d95b29;hpb=0f4a4350579604c874e1ad4b741f9b059f3585f3;p=libsigrok.git

diff --git a/hardware/common/scpi_tcp.c b/hardware/common/scpi_tcp.c
index 8f4ea21d..af2db140 100644
--- a/hardware/common/scpi_tcp.c
+++ b/hardware/common/scpi_tcp.c
@@ -17,7 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef _WIN32
 #define _WIN32_WINNT 0x0501
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
 
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
@@ -25,10 +29,7 @@
 #include <glib.h>
 #include <string.h>
 #include <unistd.h>
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
+#ifndef _WIN32
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -36,13 +37,7 @@
 #endif
 #include <errno.h>
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "scpi_tcp: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "scpi_tcp"
 
 struct scpi_tcp {
 	char *address;