diff options
author | Martin Väth <martin@mvath.de> | 2017-01-14 13:42:42 +0100 |
---|---|---|
committer | Martin Väth <martin@mvath.de> | 2017-01-14 13:44:11 +0100 |
commit | 4b0f2e6e67a4b0fe8bb2630b127872ee69323f66 (patch) | |
tree | 9132281e712062c77c1955fabe33230a837f3199 /sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch | |
parent | Fix exec bits (diff) | |
download | mv-4b0f2e6e67a4b0fe8bb2630b127872ee69323f66.tar.gz mv-4b0f2e6e67a4b0fe8bb2630b127872ee69323f66.tar.bz2 mv-4b0f2e6e67a4b0fe8bb2630b127872ee69323f66.zip |
sys-fs/squashfs-tools: Support USE debug, static. Fix 595290
Diffstat (limited to 'sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch')
-rw-r--r-- | sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch new file mode 100644 index 00000000..a103f173 --- /dev/null +++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3-static-inline.patch @@ -0,0 +1,88 @@ +--- 1/mksquashfs.c ++++ 1/mksquashfs.c +@@ -828,13 +828,13 @@ char *subpathname(struct dir_ent *dir_ent) + } + + +-inline unsigned int get_inode_no(struct inode_info *inode) ++static inline unsigned int get_inode_no(struct inode_info *inode) + { + return inode->inode_number; + } + + +-inline unsigned int get_parent_no(struct dir_info *dir) ++static inline unsigned int get_parent_no(struct dir_info *dir) + { + return dir->depth ? get_inode_no(dir->dir_ent->inode) : inode_no; + } +@@ -2027,7 +2027,7 @@ struct file_info *duplicate(long long file_size, long long bytes, + } + + +-inline int is_fragment(struct inode_info *inode) ++static inline int is_fragment(struct inode_info *inode) + { + off_t file_size = inode->buf.st_size; + +@@ -2996,13 +2996,13 @@ struct inode_info *lookup_inode2(struct stat *buf, int pseudo, int id) + } + + +-inline struct inode_info *lookup_inode(struct stat *buf) ++static inline struct inode_info *lookup_inode(struct stat *buf) + { + return lookup_inode2(buf, 0, 0); + } + + +-inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this) ++static inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this) + { + if (inode->inode_number == 0) { + inode->inode_number = use_this ? : inode_no ++; +@@ -3013,7 +3013,7 @@ inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this) + } + + +-inline struct dir_ent *create_dir_entry(char *name, char *source_name, ++static inline struct dir_ent *create_dir_entry(char *name, char *source_name, + char *nonstandard_pathname, struct dir_info *dir) + { + struct dir_ent *dir_ent = malloc(sizeof(struct dir_ent)); +@@ -3031,7 +3031,7 @@ inline struct dir_ent *create_dir_entry(char *name, char *source_name, + } + + +-inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir, ++static inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir, + struct inode_info *inode_info) + { + struct dir_info *dir = dir_ent->our_dir; +@@ -3047,7 +3047,7 @@ inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir, + } + + +-inline void add_dir_entry2(char *name, char *source_name, ++static inline void add_dir_entry2(char *name, char *source_name, + char *nonstandard_pathname, struct dir_info *sub_dir, + struct inode_info *inode_info, struct dir_info *dir) + { +@@ -3059,7 +3059,7 @@ inline void add_dir_entry2(char *name, char *source_name, + } + + +-inline void free_dir_entry(struct dir_ent *dir_ent) ++static inline void free_dir_entry(struct dir_ent *dir_ent) + { + if(dir_ent->name) + free(dir_ent->name); +@@ -3080,7 +3080,7 @@ inline void free_dir_entry(struct dir_ent *dir_ent) + } + + +-inline void add_excluded(struct dir_info *dir) ++static inline void add_excluded(struct dir_info *dir) + { + dir->excluded ++; + } |