[Bf-blender-cvs] [e8630bd] master: Comment unused BLI_rebase_path

Campbell Barton noreply at git.blender.org
Sun May 18 16:01:41 CEST 2014


Commit: e8630bdccf545f6945b0f64db588168e69cc91a7
Author: Campbell Barton
Date:   Mon May 19 00:00:59 2014 +1000
https://developer.blender.org/rBe8630bdccf545f6945b0f64db588168e69cc91a7

Comment unused BLI_rebase_path

===================================================================

M	source/blender/blenlib/BLI_path_util.h
M	source/blender/blenlib/intern/path_util.c
M	source/blender/makesrna/intern/rna_test.c

===================================================================

diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index 3e98e2c..b33b26a 100644
--- a/source/blender/blenlib/BLI_path_util.h
+++ b/source/blender/blenlib/BLI_path_util.h
@@ -97,6 +97,7 @@ void BLI_join_dirfile(char *__restrict string, const size_t maxlen,
                       const char *__restrict dir, const char *__restrict file) ATTR_NONNULL();
 const char *BLI_path_basename(const char *path) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT;
 
+#if 0
 typedef enum bli_rebase_state {
 	BLI_REBASE_NO_SRCDIR = 0,
 	BLI_REBASE_OK        = 1,
@@ -104,6 +105,7 @@ typedef enum bli_rebase_state {
 } bli_rebase_state;
 
 int BLI_rebase_path(char *abs, size_t abs_len, char *rel, size_t rel_len, const char *base_dir, const char *src_dir, const char *dest_dir);
+#endif
 
 const char *BLI_last_slash(const char *string) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT;
 int         BLI_add_slash(char *string) ATTR_NONNULL();
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 0ad2ba0..e00631f 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1950,6 +1950,8 @@ const char *BLI_path_basename(const char *path)
 	return filename ? filename + 1 : path;
 }
 
+/* UNUSED */
+#if 0
 /**
  * Produce image export path.
  * 
@@ -2076,6 +2078,8 @@ int BLI_rebase_path(char *abs, size_t abs_len,
 
 	return BLI_REBASE_OK;
 }
+#endif
+
 
 /**
  * Returns pointer to the leftmost path separator in string. Not actually used anywhere.
diff --git a/source/blender/makesrna/intern/rna_test.c b/source/blender/makesrna/intern/rna_test.c
index cf0dc5e..867e6dc 100644
--- a/source/blender/makesrna/intern/rna_test.c
+++ b/source/blender/makesrna/intern/rna_test.c
@@ -36,6 +36,10 @@
 
 #ifdef RNA_RUNTIME
 
+#ifdef ARRAY_SIZE
+#  undef ARRAY_SIZE
+#endif
+
 #define ARRAY_SIZE 3
 #define DYNAMIC_ARRAY_SIZE 64
 #define MARRAY_DIM [3][4][5]




More information about the Bf-blender-cvs mailing list