[CVS] OpenSSL: openssl/ Configure e_os.h

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Richard Levitte
  Root:   /e/openssl/cvs                   Email:  levitte@xxxxxxxxxxx
  Module: openssl                          Date:   28-Sep-2003 16:06:58
  Branch: HEAD                             Handle: 2003092815065700

  Modified files:
    openssl                 Configure e_os.h

  Log:
    Further VxWorks changes from Bob Bradley <bob@xxxxxxxxxxxxxxxxxxx>, this
    time involving VxWorks on MIPS

  Summary:
    Revision    Changes     Path
    1.411       +2  -1      openssl/Configure
    1.74        +7  -4      openssl/e_os.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/Configure
  ============================================================================
  $ cvs diff -u -r1.410 -r1.411 Configure
  --- openssl/Configure 27 Sep 2003 07:34:49 -0000      1.410
  +++ openssl/Configure 28 Sep 2003 14:06:57 -0000      1.411
  @@ -560,7 +560,8 @@
   "vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 
-I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
   "vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile 
-fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall 
-DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",
   "vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT 
-fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float 
-mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK 
-DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK 
-DDEBUG -g:::VXWORKS:-r:::::",
  -"vxworks-ppc860","ccppc:-g -msoft-float -DCPU=PPC860 -DNO_STRINGS_H 
-I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
  +"vxworks-ppc860","ccppc:-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H 
-I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
  
+"vxworks-mipsle","ccmips:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ 
-DL_ENDIAN -EL -Wl,-EL -mips2 -mno-branch-likely -G 0 -fno-builtin -msoft-float 
-DCPU=MIPS32 -DMIPSEL -DNO_STRINGS_H 
-I\$(WIND_BASE)/target/h:::VXWORKS:-r::::::::::::::::ranlibmips:",
   
   ##### Compaq Non-Stop Kernel (Tandem)
   "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 
-D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/e_os.h
  ============================================================================
  $ cvs diff -u -r1.73 -r1.74 e_os.h
  --- openssl/e_os.h    27 Sep 2003 07:34:49 -0000      1.73
  +++ openssl/e_os.h    28 Sep 2003 14:06:57 -0000      1.74
  @@ -174,6 +174,13 @@
   #define closesocket(s)          close(s)
   #define readsocket(s,b,n)       recv((s),(b),(n),0)
   #define writesocket(s,b,n)      send((s),(b),(n),0)
  +#elif defined(OPENSSL_SYS_VXWORKS)
  +#define get_last_socket_error()      errno
  +#define clear_socket_error() errno=0
  +#define ioctlsocket(a,b,c)       ioctl((a),(b),(int)(c))
  +#define closesocket(s)                   close(s)
  +#define readsocket(s,b,n)        read((s),(b),(n))
  +#define writesocket(s,b,n)       write((s),(char *)(b),(n))
   #else
   #define get_last_socket_error()      errno
   #define clear_socket_error() errno=0
  @@ -538,10 +545,6 @@
   #define TTY_STRUCT int
   
   #define sleep(a) taskDelay((a) * sysClkRateGet())
  -#if defined(ioctlsocket)
  -#undef ioctlsocket
  -#endif
  -#define ioctlsocket(a,b,c)  ioctl((a),(b),*(int*)(c))
   
   #include <vxWorks.h>
   #include <sockLib.h>
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@xxxxxxxxxxx
Automated List Manager                           majordomo@xxxxxxxxxxx