rename duplicate header defines & remove unused var.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Apr 2011 05:15:47 +0000 (05:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Apr 2011 05:15:47 +0000 (05:15 +0000)
intern/guardedalloc/MEM_sys_types.h
intern/opennl/superlu/superlu_sys_types.h
source/blender/makesrna/intern/rna_animation.c

index ff945a8c0c1a44ca92d5b76ca420bea7bd15e778..c5148e84ffed932d1dcfe6d142441504905461bc 100644 (file)
@@ -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 */
 
index d8b28e54348f4ef77e563fcbfd324c052356966d..2cd9cab453d684969c01fef85baf00813c224770 100644 (file)
@@ -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 */
 
index fb23e5ac63d813c5bab9929a83af27dcb5997a02..106c51865fdd3c1df4a9419612f18b30ea60a15d 100644 (file)
@@ -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);