diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-18 15:26:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-18 15:26:11 +0400 |
| commit | 910f04ca6373510f463de2541576b479671dc2ef (patch) | |
| tree | 544499dbbab4c371052e54cc1a32e7a60e64206a /source/blender/blenpluginapi/util.h | |
| parent | f261d58b6dfd68ae936ed8b76c8399df7a34a071 (diff) | |
| parent | f3bef40b0cf2a10bcffedae6c5235e3f5537670f (diff) | |
Merged changes in the trunk up to revision 44221.
Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/blenpluginapi/util.h')
| -rw-r--r-- | source/blender/blenpluginapi/util.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenpluginapi/util.h b/source/blender/blenpluginapi/util.h index 156e758977d..340201924d7 100644 --- a/source/blender/blenpluginapi/util.h +++ b/source/blender/blenpluginapi/util.h @@ -30,8 +30,8 @@ * SUCH DAMAGE. */ -#ifndef UTIL_H -#define UTIL_H +#ifndef __UTIL_H__ +#define __UTIL_H__ #include <sys/types.h> #include <stdlib.h> @@ -98,5 +98,5 @@ LIBEXPORT void *mallocT(int len, char *str); LIBEXPORT void *callocT(int len, char *str); LIBEXPORT void freeT(void *vmemh); -#endif /* UTIL_H */ +#endif /* __UTIL_H__ */ |