Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-17 22:59:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-17 22:59:41 +0400
commit2b7ca2304a9b17568fac57a0bceba72b9c9ab580 (patch)
tree0cb3492a7d6624bca9390375a5b20bd5b86f76d5 /intern/guardedalloc
parent99d0ba6299d9f2acdf2446b2f52e812877ebcc70 (diff)
unify include guard defines, __$FILENAME__
without the underscores these clogged up the namespace for autocompleation which was annoying.
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r--intern/guardedalloc/MEM_guardedalloc.h4
-rw-r--r--intern/guardedalloc/MEM_sys_types.h6
-rw-r--r--intern/guardedalloc/mmap_win.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index 7285843aece..83d6549218a 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -57,8 +57,8 @@
* See \ref MEM_guardedalloc.h
*/
-#ifndef MEM_MALLOCN_H
-#define MEM_MALLOCN_H
+#ifndef __MEM_GUARDEDALLOC_H__
+#define __MEM_GUARDEDALLOC_H__
#include <stdio.h> /* needed for FILE* */
#include "MEM_sys_types.h" /* needed for uintptr_t */
diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h
index 764d7c6cfa2..b7e17154df0 100644
--- a/intern/guardedalloc/MEM_sys_types.h
+++ b/intern/guardedalloc/MEM_sys_types.h
@@ -47,8 +47,8 @@
// doxygen would get a conflict
*/
-#ifndef MEM_SYS_TYPES_H
-#define MEM_SYS_TYPES_H
+#ifndef __MEM_SYS_TYPES_H__
+#define __MEM_SYS_TYPES_H__
#ifdef __cplusplus
extern "C" {
@@ -141,5 +141,5 @@ unsigned long __attribute__((__stdcall__)) htonl(unsigned long);
}
#endif
-#endif /* MEM_SYS_TYPES_H */
+#endif /* __MEM_SYS_TYPES_H__ */
diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h
index fa8d3b24815..fdbb249a932 100644
--- a/intern/guardedalloc/mmap_win.h
+++ b/intern/guardedalloc/mmap_win.h
@@ -30,8 +30,8 @@
* \author Andrea Weikert
*/
-#ifndef MMAP_WIN_H
-#define MMAP_WIN_H
+#ifndef __MMAP_WIN_H__
+#define __MMAP_WIN_H__
#define PROT_NONE 0
#define PROT_READ 1