[Pkg-voip-commits] [libre] 02/12: remove support for Cygwin (#95)

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.5.7-1
in repository libre.

commit bd9e1fe5ba21e4e8537dc49d0870e2050ca822a9
Author: Alfred E. Heggestad <alfred.heggestad at gmail.com>
Date:   Thu Nov 23 11:31:41 2017 +0100

    remove support for Cygwin (#95)
---
 include/re_net.h |  5 +----
 mk/re.mk         | 12 ------------
 src/mod/dl.c     |  3 ---
 src/net/mod.mk   |  2 --
 src/net/net.c    |  4 ++--
 src/tcp/tcp.c    |  2 +-
 src/udp/udp.c    |  2 +-
 7 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/include/re_net.h b/include/re_net.h
index 4e7c7ac..4f7205e 100644
--- a/include/re_net.h
+++ b/include/re_net.h
@@ -3,10 +3,7 @@
  *
  * Copyright (C) 2010 Creytiv.com
  */
-#ifdef CYGWIN
-#include <ws2tcpip.h>
-#include <winsock2.h>
-#elif defined(WIN32)
+#if defined(WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #else
diff --git a/mk/re.mk b/mk/re.mk
index 944da62..04a8d9e 100644
--- a/mk/re.mk
+++ b/mk/re.mk
@@ -339,16 +339,6 @@ ifeq ($(OS),win32)
 	BIN_SUFFIX	:= .exe
 	SYSROOT		:= /usr/$(MACHINE)/
 endif
-ifeq ($(OS),cygwin)
-	CFLAGS		+= -DCYGWIN -D_WIN32_WINNT=0x0501
-	LIBS		+= -lwsock32 -lws2_32
-	LFLAGS		+=
-	SH_LFLAGS	+= -shared
-	MOD_LFLAGS	+=
-	APP_LFLAGS	+= -Wl,-E
-	AR		:= ar
-	AFLAGS		:= cru
-endif
 
 CFLAGS	+= -DOS=\"$(OS)\"
 
@@ -603,11 +593,9 @@ CFLAGS  += -DHAVE_KQUEUE
 endif
 CFLAGS  += -DHAVE_UNAME
 CFLAGS  += -DHAVE_UNISTD_H
-ifneq ($(OS),cygwin)
 CFLAGS  += -DHAVE_STRINGS_H
 CFLAGS  += -DHAVE_GAI_STRERROR
 endif
-endif
 
 ifneq ($(HAVE_ARC4RANDOM),)
 CFLAGS  += -DHAVE_ARC4RANDOM
diff --git a/src/mod/dl.c b/src/mod/dl.c
index 20242f4..a449927 100644
--- a/src/mod/dl.c
+++ b/src/mod/dl.c
@@ -13,9 +13,6 @@
 #define DEBUG_LEVEL 5
 #include <re_dbg.h>
 
-#ifdef CYGWIN
-#define RTLD_LOCAL   0
-#endif
 
 static const int dl_flag = RTLD_NOW | RTLD_LOCAL;
 
diff --git a/src/net/mod.mk b/src/net/mod.mk
index ccd1e0e..8f12899 100644
--- a/src/net/mod.mk
+++ b/src/net/mod.mk
@@ -15,9 +15,7 @@ SRCS	+= net/sockopt.c
 
 # Platform dependant files
 ifneq ($(OS),win32)
-ifneq ($(OS),cygwin)
 SRCS	+= net/posix/pif.c
-endif
 else
 SRCS	+= net/win32/wif.c
 endif
diff --git a/src/net/net.c b/src/net/net.c
index 33b35ff..0978b1b 100644
--- a/src/net/net.c
+++ b/src/net/net.c
@@ -7,7 +7,7 @@
 #define _DEFAULT_SOURCE 1
 #include <stdlib.h>
 #include <string.h>
-#if !defined(WIN32) && !defined(CYGWIN)
+#if !defined(WIN32)
 #define __USE_BSD 1  /**< Use BSD code */
 #include <unistd.h>
 #include <netdb.h>
@@ -66,7 +66,7 @@ int net_hostaddr(int af, struct sa *ip)
  */
 int net_default_source_addr_get(int af, struct sa *ip)
 {
-#if defined(WIN32) || defined(CYGWIN)
+#if defined(WIN32)
 	return net_hostaddr(af, ip);
 #else
 	char ifname[64] = "";
diff --git a/src/tcp/tcp.c b/src/tcp/tcp.c
index 68dc2d6..f146b87 100644
--- a/src/tcp/tcp.c
+++ b/src/tcp/tcp.c
@@ -10,7 +10,7 @@
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
-#if !defined(WIN32) && !defined (CYGWIN)
+#if !defined(WIN32)
 #define __USE_POSIX 1  /**< Use POSIX flag */
 #define __USE_XOPEN2K 1/**< Use POSIX.1:2001 code */
 #define __USE_MISC 1
diff --git a/src/udp/udp.c b/src/udp/udp.c
index 07ad55d..f6312ab 100644
--- a/src/udp/udp.c
+++ b/src/udp/udp.c
@@ -10,7 +10,7 @@
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
-#if !defined(WIN32) && !defined (CYGWIN)
+#if !defined(WIN32)
 #define __USE_POSIX 1  /**< Use POSIX flag */
 #define __USE_XOPEN2K 1/**< Use POSIX.1:2001 code */
 #include <netdb.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/libre.git