]> wimlib.net Git - wimlib/blobdiff - src/resource.c
mount_image.c: add fallback definitions of RENAME_* constants
[wimlib] / src / resource.c
index a643ce0340c91e320b85e331c7da1bce7dedd135..a2aee42dd0bf0103cc95c4c09a5b9913124e2fd9 100644 (file)
@@ -18,7 +18,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this file; if not, see http://www.gnu.org/licenses/.
+ * along with this file; if not, see https://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -333,8 +333,8 @@ read_compressed_wim_resource(const struct wim_resource_descriptor * const rdesc,
                /* Now fill in chunk_offsets from the entries we have read in
                 * chunk_tab_data.  We break aliasing rules here to avoid having
                 * to allocate yet another array.  */
-               typedef le64 _may_alias_attribute aliased_le64_t;
-               typedef le32 _may_alias_attribute aliased_le32_t;
+               typedef le64 __attribute__((may_alias)) aliased_le64_t;
+               typedef le32 __attribute__((may_alias)) aliased_le32_t;
                u64 * chunk_offsets_p = chunk_offsets;
 
                if (alt_chunk_table) {
@@ -778,7 +778,7 @@ read_blob_prefix(const struct blob_descriptor *blob, u64 size,
        #ifdef WITH_NTFS_3G
                [BLOB_IN_NTFS_VOLUME] = read_ntfs_attribute_prefix,
        #endif
-       #ifdef __WIN32__
+       #ifdef _WIN32
                [BLOB_IN_WINDOWS_FILE] = read_windows_file_prefix,
        #endif
        };