diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-11-14 13:49:45 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-14 13:49:45 +0300 |
commit | 14795baf2142024905c6936a82eaa2321dae8cb8 (patch) | |
tree | 78ab64793ac1f8d22c4636fd630bd4d85f7e7f3c | |
parent | 64c0c13e6e08c51e92504631468db864f553d9b5 (diff) |
Cleanup: headers
-rw-r--r-- | source/blender/blenlib/BLI_hash_md5.h | 9 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_hash_mm2a.h | 6 | ||||
-rw-r--r-- | source/blender/blenlib/intern/hash_md5.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 1 |
5 files changed, 9 insertions, 12 deletions
diff --git a/source/blender/blenlib/BLI_hash_md5.h b/source/blender/blenlib/BLI_hash_md5.h index cab3671a5ca..81a0eb9e828 100644 --- a/source/blender/blenlib/BLI_hash_md5.h +++ b/source/blender/blenlib/BLI_hash_md5.h @@ -18,16 +18,13 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __BLI_MD5_H__ -#define __BLI_MD5_H__ +#ifndef __BLI_HASH_MD5_H__ +#define __BLI_HASH_MD5_H__ /** \file BLI_hash_md5.h * \ingroup bli */ -#include <stdio.h> -#include <stdlib.h> - /* 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 @@ -43,4 +40,4 @@ int md5_stream(FILE *stream, void *resblock); char *md5_to_hexdigest(void *resblock, char r_hex_digest[33]); -#endif /* __BLI_MD5_H__ */ +#endif /* __BLI_HASH_MD5_H__ */ diff --git a/source/blender/blenlib/BLI_hash_mm2a.h b/source/blender/blenlib/BLI_hash_mm2a.h index 503eb5e96d9..007dec4f4d6 100644 --- a/source/blender/blenlib/BLI_hash_mm2a.h +++ b/source/blender/blenlib/BLI_hash_mm2a.h @@ -18,8 +18,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __BLI_MM2A_H__ -#define __BLI_MM2A_H__ +#ifndef __BLI_HASH_MM2A_H__ +#define __BLI_HASH_MM2A_H__ /** \file BLI_hash_mm2a.h * \ingroup bli @@ -42,4 +42,4 @@ void BLI_hash_mm2a_add_int(BLI_HashMurmur2A *mm2, int data); uint32_t BLI_hash_mm2a_end(BLI_HashMurmur2A *mm2); -#endif /* __BLI_MM2A_H__ */ +#endif /* __BLI_HASH_MM2A_H__ */ diff --git a/source/blender/blenlib/intern/hash_md5.c b/source/blender/blenlib/intern/hash_md5.c index 98a5cc545b5..43019781577 100644 --- a/source/blender/blenlib/intern/hash_md5.c +++ b/source/blender/blenlib/intern/hash_md5.c @@ -29,13 +29,13 @@ * according to the definition of MD5 in RFC 1321 from April 1992. */ -#include "BLI_hash_md5.h" /* own include */ - #include <stdlib.h> #include <string.h> #include <stdio.h> #include <sys/types.h> +#include "BLI_hash_md5.h" /* own include */ + #if defined HAVE_LIMITS_H || defined _LIBC # include <limits.h> #endif diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index bfd702e9416..90df2d7ad5b 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -8031,7 +8031,6 @@ float ui_block_calc_pie_segment(uiBlock *block, const float event_xy[2]) len = normalize_v2_v2(block->pie_data.pie_dir, seg2); - /* ten pixels for now, a bit arbitrary */ if (len < U.pie_menu_threshold * U.pixelsize) block->pie_data.flags |= UI_PIE_INVALID_DIR; else diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index 5399e54a30e..285f8460828 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -30,6 +30,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include "BLI_utildefines.h" #include "BLI_string.h" |