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>2014-05-18 18:00:59 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-05-18 18:00:59 +0400
commite8630bdccf545f6945b0f64db588168e69cc91a7 (patch)
tree795d60f72e99eeb106d993c2be6d11c157f3cbb6 /source/blender
parent2a49bf35f08752cadf998a05867c4244378b4c57 (diff)
Comment unused BLI_rebase_path
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenlib/BLI_path_util.h2
-rw-r--r--source/blender/blenlib/intern/path_util.c4
-rw-r--r--source/blender/makesrna/intern/rna_test.c4
3 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index 3e98e2ceeae..b33b26a2feb 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 0ad2ba049b4..e00631fe996 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 cf0dc5e332d..867e6dcd8ff 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]