From a4b7aaafe62f65327d67fd246201a2e959e50aff Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 6 Apr 2019 12:42:27 +0000
Subject: [PATCH] plugin/ftp: Fixed to compile in MacOS

git-svn-id: svn://ultimatepp.org/upp/trunk@12954 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/plugin/ftp/lib/ftplib.cpp | 10 +++++-----
 uppsrc/plugin/ftp/lib/ftplib.h   | 13 -------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/uppsrc/plugin/ftp/lib/ftplib.cpp b/uppsrc/plugin/ftp/lib/ftplib.cpp
index 00340086c..8b4a43cb2 100644
--- a/uppsrc/plugin/ftp/lib/ftplib.cpp
+++ b/uppsrc/plugin/ftp/lib/ftplib.cpp
@@ -87,14 +87,14 @@ static const char version[] =
 
 GLOBALDEF int ftplib_debug = 0;
 
-#if defined(__unix__) || defined(VMS)
-#define net_read read
-#define net_write write
-#define net_close close
-#elif defined(_WIN32)
+#ifdef _WIN32
 #define net_read(x,y,z) recv(x,y,z,0)
 #define net_write(x,y,z) send(x,y,z,0)
 #define net_close closesocket
+#else
+#define net_read read
+#define net_write write
+#define net_close close
 #endif
 
 #if defined(NEED_MEMCCPY)
diff --git a/uppsrc/plugin/ftp/lib/ftplib.h b/uppsrc/plugin/ftp/lib/ftplib.h
index 0d200d7d2..b06a74c59 100644
--- a/uppsrc/plugin/ftp/lib/ftplib.h
+++ b/uppsrc/plugin/ftp/lib/ftplib.h
@@ -24,21 +24,8 @@
 #if !defined(__FTPLIB_H)
 #define __FTPLIB_H
 
-#if defined(__unix__) || defined(VMS)
 #define GLOBALDEF
 #define GLOBALREF extern
-#elif defined(_WIN32)
-#define GLOBALDEF
-#define GLOBALREF extern
-/*
-#if defined BUILDING_LIBRARY
-#define GLOBALDEF __declspec(dllexport)
-#define GLOBALREF __declspec(dllexport)
-#else
-#define GLOBALREF __declspec(dllimport)
-#endif
-*/
-#endif
 
 /* FtpAccess() type codes */
 #define FTPLIB_DIR 1