freebsd: fix warning about redeclaration.

pull/61/merge
Eric Leblond 13 years ago committed by Victor Julien
parent 4d2305c0a8
commit 7af9fd7735

@ -60,7 +60,9 @@ typedef enum {
#define ROL(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
#define ROLc(x, y) ( (((unsigned long)(x)<<(unsigned long)((y)&31)) | (((unsigned long)(x)&0xFFFFFFFFUL)>>(unsigned long)(32-((y)&31)))) & 0xFFFFFFFFUL)
#ifndef MIN
#define MIN(x, y) ( ((x)<(y))?(x):(y) )
#endif
typedef struct Sha1State_ {
uint64_t length;

@ -41,7 +41,10 @@
#ifdef PROFILING
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#define DEFAULT_LOG_FILENAME "profile.log"
#define DEFAULT_LOG_MODE_APPEND "yes"

Loading…
Cancel
Save