diff options
| author | Christian Beier <dontmind@freeshell.org> | 2016-12-30 17:11:56 +0100 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2016-12-30 17:11:56 +0100 |
| commit | b7a7c4d120d145e11af0f3860e14be02e977d30d (patch) | |
| tree | ec818f8c2916b90934ec63550467d702ea68f7b3 | |
| parent | 6b2fb4e3c8e6d3e5cf88cd2747dc3700d501b8a4 (diff) | |
| download | libtdevnc-b7a7c4d1.tar.gz libtdevnc-b7a7c4d1.zip | |
Fix building on OSX without SSL.
| -rw-r--r-- | common/md5.c | 7 | ||||
| -rw-r--r-- | common/md5.h | 14 |
2 files changed, 10 insertions, 11 deletions
diff --git a/common/md5.c b/common/md5.c index c3e3fd7..13e47a8 100644 --- a/common/md5.c +++ b/common/md5.c @@ -27,12 +27,11 @@ # include <string.h> #include "md5.h" +#include "rfb/rfbconfig.h" -/* #ifdef _LIBC */ -# include <endian.h> -# if __BYTE_ORDER == __BIG_ENDIAN +#ifdef LIBVNCSERVER_WORDS_BIGENDIAN # define WORDS_BIGENDIAN 1 -# endif +#endif /* We need to keep the namespace clean so define the MD5 function protected using leading __ . */ # define md5_init_ctx __md5_init_ctx diff --git a/common/md5.h b/common/md5.h index b48545b..0fb0a4a 100644 --- a/common/md5.h +++ b/common/md5.h @@ -98,21 +98,21 @@ struct md5_ctx /* Initialize structure containing state of computation. (RFC 1321, 3.3: Step 3) */ -extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW; +extern void __md5_init_ctx (struct md5_ctx *ctx); /* Starting with the result of former calls of this function (or the initialization function update the context for the next LEN bytes starting at BUFFER. It is necessary that LEN is a multiple of 64!!! */ extern void __md5_process_block (const void *buffer, size_t len, - struct md5_ctx *ctx) __THROW; + struct md5_ctx *ctx); /* Starting with the result of former calls of this function (or the initialization function update the context for the next LEN bytes starting at BUFFER. It is NOT required that LEN is a multiple of 64. */ extern void __md5_process_bytes (const void *buffer, size_t len, - struct md5_ctx *ctx) __THROW; + struct md5_ctx *ctx); /* Process the remaining bytes in the buffer and put result from CTX in first 16 bytes following RESBUF. The result is always in little @@ -121,7 +121,7 @@ extern void __md5_process_bytes (const void *buffer, size_t len, IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ -extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW; +extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf); /* Put result from CTX in first 16 bytes following RESBUF. The result is @@ -130,19 +130,19 @@ extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW; IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ -extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW; +extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf); /* Compute MD5 message digest for bytes read from STREAM. The resulting message digest number will be written into the 16 bytes beginning at RESBLOCK. */ -extern int __md5_stream (FILE *stream, void *resblock) __THROW; +extern int __md5_stream (FILE *stream, void *resblock); /* Compute MD5 message digest for LEN bytes beginning at BUFFER. The result is always in little endian byte order, so that a byte-wise output yields to the wanted ASCII representation of the message digest. */ extern void *__md5_buffer (const char *buffer, size_t len, - void *resblock) __THROW; + void *resblock); #endif /* md5.h */ |