ext4_types: change "user" prefix to "ext4_user"

[lwext4.git] / include / ext4_types.h

diff --git a/include/ext4_types.h b/include/ext4_types.h
index a7170a7fecc66e247c017b3f8ed8987d943da900..2d9e49cb2fd65c9cfe749557dcc4f5b401188d5e 100644 (file)
--- a/include/ext4_types.h
+++ b/include/ext4_types.h
@@ -495,8 +495,7 @@ struct ext4_dir_en {
        uint8_t name_len;   /* Lower 8 bits of name length */
 
        union ext4_dir_en_internal in;
-
-       uint8_t name[EXT4_DIRECTORY_FILENAME_LEN]; /* Entry name */
+       uint8_t name[]; /* Entry name */
 };
 
 /* Structures for indexed directory */
@@ -1005,6 +1004,24 @@ struct jbd_sb {
 }
 #endif
 
+
+#if CONFIG_USE_USER_MALLOC
+
+#define ext4_malloc  ext4_user_malloc
+#define ext4_calloc  ext4_user_calloc
+#define ext4_realloc ext4_user_realloc
+#define ext4_free    ext4_user_free
+
+#else
+
+#define ext4_malloc  malloc
+#define ext4_calloc  calloc
+#define ext4_realloc realloc
+#define ext4_free    free
+
+#endif
+
+
 #endif /* EXT4_TYPES_H_ */
 
 /**