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:
-rw-r--r--intern/guardedalloc/MEM_sys_types.h6
-rw-r--r--intern/opennl/superlu/superlu_sys_types.h6
-rw-r--r--source/blender/makesrna/intern/rna_animation.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/intern/guardedalloc/MEM_sys_types.h b/intern/guardedalloc/MEM_sys_types.h
index ff945a8c0c1..c5148e84ffe 100644
--- a/intern/guardedalloc/MEM_sys_types.h
+++ b/intern/guardedalloc/MEM_sys_types.h
@@ -48,8 +48,8 @@
* \ingroup MEM
*/
-#ifndef BLO_SYS_TYPES_H
-#define BLO_SYS_TYPES_H
+#ifndef MEM_SYS_TYPES_H
+#define MEM_SYS_TYPES_H
#ifdef __cplusplus
extern "C" {
@@ -127,5 +127,5 @@ typedef unsigned long uintptr_t;
}
#endif
-#endif /* eof */
+#endif /* MEM_SYS_TYPES_H */
diff --git a/intern/opennl/superlu/superlu_sys_types.h b/intern/opennl/superlu/superlu_sys_types.h
index d8b28e54348..2cd9cab453d 100644
--- a/intern/opennl/superlu/superlu_sys_types.h
+++ b/intern/opennl/superlu/superlu_sys_types.h
@@ -48,8 +48,8 @@
// jesterKing: renamed to superlu_sys_types.h
*/
-#ifndef BLO_SYS_TYPES_H
-#define BLO_SYS_TYPES_H
+#ifndef SUPERLU_SYS_TYPES_H
+#define SUPERLU_SYS_TYPES_H
#ifdef __cplusplus
extern "C" {
@@ -129,5 +129,5 @@ typedef unsigned long uintptr_t;
}
#endif
-#endif /* eof */
+#endif /* SUPERLU_SYS_TYPES_H */
diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c
index fb23e5ac63d..106c51865fd 100644
--- a/source/blender/makesrna/intern/rna_animation.c
+++ b/source/blender/makesrna/intern/rna_animation.c
@@ -770,7 +770,7 @@ static void rna_api_animdata_drivers(BlenderRNA *brna, PropertyRNA *cprop)
PropertyRNA *parm;
FunctionRNA *func;
- PropertyRNA *prop;
+ // PropertyRNA *prop;
RNA_def_property_srna(cprop, "AnimDataDrivers");
srna= RNA_def_struct(brna, "AnimDataDrivers", NULL);