diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | defines.h | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20011123 | ||
2 | - (djm) Compat define for OpenSSL < 0.9.6 (No OPENSSL_free) | ||
3 | |||
1 | 20011031 | 4 | 20011031 |
2 | - (djm) Unsmoke drugs: config files should be noreplace. | 5 | - (djm) Unsmoke drugs: config files should be noreplace. |
3 | 6 | ||
@@ -6792,4 +6795,4 @@ | |||
6792 | - Wrote replacements for strlcpy and mkdtemp | 6795 | - Wrote replacements for strlcpy and mkdtemp |
6793 | - Released 1.0pre1 | 6796 | - Released 1.0pre1 |
6794 | 6797 | ||
6795 | $Id: ChangeLog,v 1.1629 2001/10/30 23:31:13 djm Exp $ | 6798 | $Id: ChangeLog,v 1.1630 2001/10/31 22:32:34 djm Exp $ |
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _DEFINES_H | 1 | #ifndef _DEFINES_H |
2 | #define _DEFINES_H | 2 | #define _DEFINES_H |
3 | 3 | ||
4 | /* $Id: defines.h,v 1.74 2001/10/30 02:50:40 tim Exp $ */ | 4 | /* $Id: defines.h,v 1.75 2001/10/31 22:32:34 djm Exp $ */ |
5 | 5 | ||
6 | /* Necessary headers */ | 6 | /* Necessary headers */ |
7 | 7 | ||
@@ -45,6 +45,7 @@ | |||
45 | #include <unistd.h> /* For STDIN_FILENO, etc */ | 45 | #include <unistd.h> /* For STDIN_FILENO, etc */ |
46 | #include <termios.h> /* Struct winsize */ | 46 | #include <termios.h> /* Struct winsize */ |
47 | #include <fcntl.h> /* For O_NONBLOCK */ | 47 | #include <fcntl.h> /* For O_NONBLOCK */ |
48 | #include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ | ||
48 | 49 | ||
49 | /* *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively */ | 50 | /* *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively */ |
50 | #ifdef HAVE_STRINGS_H | 51 | #ifdef HAVE_STRINGS_H |
@@ -450,6 +451,11 @@ struct winsize { | |||
450 | # define getpgrp() getpgrp(0) | 451 | # define getpgrp() getpgrp(0) |
451 | #endif | 452 | #endif |
452 | 453 | ||
454 | /* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */ | ||
455 | #if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f) | ||
456 | # define OPENSSL_free(x) Free(x) | ||
457 | #endif | ||
458 | |||
453 | /* | 459 | /* |
454 | * Define this to use pipes instead of socketpairs for communicating with the | 460 | * Define this to use pipes instead of socketpairs for communicating with the |
455 | * client program. Socketpairs do not seem to work on all systems. | 461 | * client program. Socketpairs do not seem to work on all systems. |