8254c3c5d3
C99 allows array function parameters to use the static keyword for their sizes. This tells the compiler that the parameter will have at least the specified size, and calling code will fail to compile if that guarantee is not met. However, this syntax is not legal in C++. This commit reverts r300824, which worked around the problem for sys/sys/md5.h only, and introduces a new macro: min_size(). min_size(x) can be used in headers as a static array size, but will still compile in C++ mode. Reviewed by: cem, ed MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D8277
48 lines
810 B
C
48 lines
810 B
C
/* $FreeBSD$ */
|
|
|
|
#ifndef _MD5_H_
|
|
#define _MD5_H_
|
|
|
|
#ifndef _KERNEL
|
|
|
|
/* Ensure libmd symbols do not clash with libcrypto */
|
|
|
|
#ifndef MD5Init
|
|
#define MD5Init _libmd_MD5Init
|
|
#endif
|
|
#ifndef MD5Update
|
|
#define MD5Update _libmd_MD5Update
|
|
#endif
|
|
#ifndef MD5Pad
|
|
#define MD5Pad _libmd_MD5Pad
|
|
#endif
|
|
#ifndef MD5Final
|
|
#define MD5Final _libmd_MD5Final
|
|
#endif
|
|
#ifndef MD5Transform
|
|
#define MD5Transform _libmd_MD5Transform
|
|
#endif
|
|
#ifndef MD5End
|
|
#define MD5End _libmd_MD5End
|
|
#endif
|
|
#ifndef MD5Fd
|
|
#define MD5Fd _libmd_MD5Fd
|
|
#endif
|
|
#ifndef MD5FdChunk
|
|
#define MD5FdChunk _libmd_MD5FdChunk
|
|
#endif
|
|
#ifndef MD5File
|
|
#define MD5File _libmd_MD5File
|
|
#endif
|
|
#ifndef MD5FileChunk
|
|
#define MD5FileChunk _libmd_MD5FileChunk
|
|
#endif
|
|
#ifndef MD5Data
|
|
#define MD5Data _libmd_MD5Data
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#include <sys/md5.h>
|
|
#endif /* _MD5_H_ */
|