[Bf-blender-cvs] [9d9ee66] asset-experiments: Get rid of nice 'static' in array args of functions, MSVC does not like them. :(

Bastien Montagne noreply at git.blender.org
Wed May 6 19:59:36 CEST 2015


Commit: 9d9ee6699a53b2ef893f1851c4aea769788a40ac
Author: Bastien Montagne
Date:   Wed May 6 19:59:02 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB9d9ee6699a53b2ef893f1851c4aea769788a40ac

Get rid of nice 'static' in array args of functions, MSVC does not like them. :(

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

M	source/blender/blenlib/intern/BLI_filelist.c

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

diff --git a/source/blender/blenlib/intern/BLI_filelist.c b/source/blender/blenlib/intern/BLI_filelist.c
index 6602377..b1df197 100644
--- a/source/blender/blenlib/intern/BLI_filelist.c
+++ b/source/blender/blenlib/intern/BLI_filelist.c
@@ -240,7 +240,7 @@ unsigned int BLI_filelist_dir_contents(const char *dirname,  struct direntry **f
  *
  */
 void BLI_filelist_entry_size_to_string(
-        struct stat *st, const uint64_t sz, const bool compact, char r_size[static FILELIST_DIRENTRY_SIZE_LEN])
+        struct stat *st, const uint64_t sz, const bool compact, char r_size[FILELIST_DIRENTRY_SIZE_LEN])
 {
 	double size;
 	const char *fmt;
@@ -276,8 +276,8 @@ void BLI_filelist_entry_size_to_string(
  *
  */
 void BLI_filelist_entry_mode_to_string(
-        struct stat *st, const bool UNUSED(compact), char r_mode1[static FILELIST_DIRENTRY_MODE_LEN],
-        char r_mode2[static FILELIST_DIRENTRY_MODE_LEN], char r_mode3[static FILELIST_DIRENTRY_MODE_LEN])
+        struct stat *st, const bool UNUSED(compact), char r_mode1[FILELIST_DIRENTRY_MODE_LEN],
+        char r_mode2[FILELIST_DIRENTRY_MODE_LEN], char r_mode3[FILELIST_DIRENTRY_MODE_LEN])
 {
 	const char *types[8] = {"---", "--x", "-w-", "-wx", "r--", "r-x", "rw-", "rwx"};
 
@@ -313,7 +313,7 @@ void BLI_filelist_entry_mode_to_string(
  *
  */
 void BLI_filelist_entry_owner_to_string(
-        struct stat *st, const bool UNUSED(compact), char r_owner[static FILELIST_DIRENTRY_OWNER_LEN])
+        struct stat *st, const bool UNUSED(compact), char r_owner[FILELIST_DIRENTRY_OWNER_LEN])
 {
 #ifdef WIN32
 	strcpy(r_owner, "unknown");
@@ -334,7 +334,7 @@ void BLI_filelist_entry_owner_to_string(
  */
 void BLI_filelist_entry_datetime_to_string(
         struct stat *st, const int64_t ts, const bool compact,
-        char r_time[static FILELIST_DIRENTRY_TIME_LEN], char r_date[static FILELIST_DIRENTRY_DATE_LEN])
+        char r_time[FILELIST_DIRENTRY_TIME_LEN], char r_date[FILELIST_DIRENTRY_DATE_LEN])
 {
 	const struct tm *tm = localtime(st ? &st->st_mtime : &ts);
 	const time_t zero = 0;




More information about the Bf-blender-cvs mailing list