diff options
| author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-05-20 07:10:42 (GMT) |
|---|---|---|
| committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-05-20 07:10:42 (GMT) |
| commit | 74c11f5f2026bb02385763fd96d41d1d6a5f989c (patch) | |
| tree | 082aabc267ab563cf3feaff0af29bc8ded99ca2e /include/md5.h | |
| parent | c673e2e56c9ab6b4d475467fb752c6fa83d9bc41 (diff) | |
| parent | 0f36e7de86f181eed7e49eedb3d66a0c6ab6f8cd (diff) | |
Merge branch 'master' of git.gromacs.org:tng
Merged conflicts.
Conflicts:
src/lib/tng_io.c
Diffstat (limited to 'include/md5.h')
| -rw-r--r-- | include/md5.h | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/include/md5.h b/include/md5.h index 3652594..d618489 100644 --- a/include/md5.h +++ b/include/md5.h @@ -49,12 +49,6 @@ #ifndef md5_INCLUDED # define md5_INCLUDED -#ifndef USE_WINDOWS -#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) -#define USE_WINDOWS -#endif /* win32... */ -#endif /* not defined USE_WINDOWS */ - /* * This package supports both compile-time and run-time determination of CPU * byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be @@ -80,14 +74,28 @@ extern "C" { #endif +#ifndef USE_WINDOWS +#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) +#define USE_WINDOWS +#endif /* win32... */ +#endif /* not defined USE_WINDOWS */ + +#ifndef DECLSPECDLLEXPORT +#ifdef USE_WINDOWS +#define DECLSPECDLLEXPORT __declspec(dllexport) +#else /* USE_WINDOWS */ +#define DECLSPECDLLEXPORT +#endif /* USE_WINDOWS */ +#endif /* DECLSPECDLLEXPORT */ + /* Initialize the algorithm. */ -void md5_init(md5_state_t *pms); +void DECLSPECDLLEXPORT tng_md5_init(md5_state_t *pms); /* Append a string to the message. */ -void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); +void DECLSPECDLLEXPORT tng_md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes); /* Finish the message and return the digest. */ -void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); +void DECLSPECDLLEXPORT tng_md5_finish(md5_state_t *pms, md5_byte_t digest[16]); #ifdef __cplusplus } /* end extern "C" */ |