Commit 9a5d80cb authored by Richard Levitte's avatar Richard Levitte
Browse files

Move more socket stuff 



The socket stuff for DJGPP and VMS was only partially moved to
include/internal/sockets.h...

Remains vxWorks.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4254)
parent 90862ab4

e_os.h

+0 −9
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ extern "C" { 
# endif



# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)

#  define NO_SYS_PARAM_H

#  define NO_CHMOD

#  define NO_SYSLOG

# endif
@@ -113,7 +112,6 @@ extern "C" { 
# endif



# ifdef WIN32

#  define NO_SYS_UN_H

#  undef get_last_sys_error

#  undef clear_sys_error

#  define get_last_sys_error()    GetLastError()
@@ -129,10 +127,6 @@ extern "C" { 
#  ifdef __DJGPP__

#   include <unistd.h>

#   include <sys/stat.h>

#   include <sys/socket.h>

#   include <sys/un.h>

#   include <tcp.h>

#   include <netdb.h>

#   define _setmode setmode

#   define _O_TEXT O_TEXT

#   define _O_BINARY O_BINARY
@@ -311,9 +305,6 @@ extern FILE *_imp___iob; 
  */

#   define EXIT(n)  exit((n) ? (((n) << 3) | 2 | 0x10000000 | 0x35a000) : 1)



#   define NO_SYS_PARAM_H

#   define NO_SYS_UN_H



#   define DEFAULT_HOME "SYS$LOGIN:"



#  else

include/internal/sockets.h

+29 −16
Original line number Diff line number Diff line
@@ -10,11 +10,26 @@ 


#ifndef HEADER_OPENSSL_SOCKETS



# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)

#  define NO_SYS_PARAM_H

# endif

# ifdef WIN32

#  define NO_SYS_UN_H

# endif

# ifdef OPENSSL_SYS_VMS

#  define NO_SYS_PARAM_H

#  define NO_SYS_UN_H

# endif



# ifdef OPENSSL_NO_SOCK



# elif defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)

#  if !defined(__DJGPP__)

#   if defined(_WIN32_WCE) && _WIN32_WCE<410

#  if defined(__DJGPP__)

#   include <sys/socket.h>

#   include <sys/un.h>

#   include <tcp.h>

#   include <netdb.h>

#  elif defined(_WIN32_WCE) && _WIN32_WCE<410

#   define getservbyname _masked_declaration_getservbyname

#  endif

#  if !defined(IPPROTO_IP)
@@ -38,8 +53,6 @@ struct servent *PASCAL getservbyname(const char *, const char *); 
#   define socket(d,t,p)   ((int)socket(d,t,p))

#   define accept(s,f,l)   ((int)accept(s,f,l))

#  endif

#  else

#  endif



# else