Commit dc01b6b1 authored by Richard Levitte's avatar Richard Levitte
Browse files

Changes to have OpenSSL compile on OS/2. 

Contributed by "Brian Havard" <brianh@kheldar.apana.org.au>
parent b7a26e6d

Configure

+4 −1
Original line number Diff line number Diff line
@@ -453,10 +453,13 @@ my %table=( 
##### GNU Hurd

"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",



##### OS/2 EMX

"OS2-EMX", "gcc::::::::",



);



my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32

	BC-16 Mingw32);

	BC-16 Mingw32 OS2-EMX);



my $prefix="";

my $openssldir="";

INSTALL.OS2

0 → 100644
+22 −0
Original line number Diff line number Diff line 
 

 Installation on OS/2

 --------------------



 You need to have the following tools installed:



  * EMX GCC

  * PERL

  * GNU make





 To build the makefile, run



 > os2\os2-emx



 This will configure OpenSSL and create OS2-EMX.mak which you then use to 

 build the OpenSSL libraries & programs by running



 > make -f os2-emx.mak



 If that finishes successfully you will find the libraries and programs in the

 "out" directory.

crypto/bio/bss_file.c

+5 −0
Original line number Diff line number Diff line
@@ -210,6 +210,11 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) 
			_setmode(fileno((FILE *)ptr),_O_TEXT);

		else

			_setmode(fileno((FILE *)ptr),_O_BINARY);

#elif defined(OPENSSL_SYS_OS2)

		if (num & BIO_FP_TEXT)

			setmode(fileno((FILE *)ptr), O_TEXT);

		else

			setmode(fileno((FILE *)ptr), O_BINARY);

#endif

		break;

	case BIO_C_SET_FILENAME:

crypto/bio/bss_log.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
#  include <starlet.h>

#elif defined(__ultrix)

#  include <sys/syslog.h>

#elif !defined(MSDOS) /* Unix */

#elif !defined(MSDOS) && !defined(NO_SYSLOG) /* Unix */

#  include <syslog.h>

#endif

crypto/o_time.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result) 
	{

	struct tm *ts = NULL;



#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(__CYGWIN32__) && (!defined(OPENSSL_SYS_VMS) || defined(gmtime_r))

#if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_OS2) && !defined(__CYGWIN32__) && (!defined(OPENSSL_SYS_VMS) || defined(gmtime_r))

	/* should return &data, but doesn't on some systems,

	   so we don't even look at the return value */

	gmtime_r(timer,result);