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