diff options
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/mghttpd/mongoose.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 18632afa2f..b7c2720c16 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2009-11-23 Joel Sherrill <joel.sherrill@oarcorp.com> + + * mghttpd/mongoose.c: crypto_sw table is not used when SSL is disabled. + RTEMS does not have flockfile/funlockfile. + 2009-11-22 Ralf Corsépius <ralf.corsepius@rtems.org> * Makefile.am: Add mghttpd. diff --git a/cpukit/mghttpd/mongoose.c b/cpukit/mghttpd/mongoose.c index b5cbb957d0..f863847491 100644 --- a/cpukit/mghttpd/mongoose.c +++ b/cpukit/mghttpd/mongoose.c @@ -168,6 +168,10 @@ typedef struct DIR { #if HAVE_SYS_MMAN_H #include <sys/mman.h> #endif +#if defined(__rtems__) +#define flockfile(x) (void) 0 +#define funlockfile(x) (void) 0 +#endif #include <netinet/in.h> #include <arpa/inet.h> #include <sys/time.h> @@ -307,6 +311,7 @@ static struct ssl_func ssl_sw[] = { {NULL, NULL} }; +#if !defined(NO_SSL) /* * Similar array as ssl_sw. These functions are located in different lib. */ @@ -316,6 +321,7 @@ static struct ssl_func crypto_sw[] = { {"CRYPTO_set_id_callback", NULL}, {NULL, NULL} }; +#endif /* * Month names |