[149937] trunk/dports/archivers/libarchive/files/ patch-libarchive__archive_read_support_format_lha.c.diff

[toby at macports.org]

Revision: 149937
          https://trac.macports.org/changeset/149937
Author:   toby at macports.org
Date:     2016-07-05 18:07:06 -0700 (Tue, 05 Jul 2016)
Log Message:
-----------
Another try...

Modified Paths:
--------------
    trunk/dports/archivers/libarchive/files/patch-libarchive__archive_read_support_format_lha.c.diff

Modified: trunk/dports/archivers/libarchive/files/patch-libarchive__archive_read_support_format_lha.c.diff
===================================================================
--- trunk/dports/archivers/libarchive/files/patch-libarchive__archive_read_support_format_lha.c.diff	2016-07-06 01:05:56 UTC (rev 149936)
+++ trunk/dports/archivers/libarchive/files/patch-libarchive__archive_read_support_format_lha.c.diff	2016-07-06 01:07:06 UTC (rev 149937)
@@ -1,11 +1,17 @@
 --- libarchive/archive_read_support_format_lha.c.orig	2016-06-28 22:40:09.000000000 -0700
 +++ libarchive/archive_read_support_format_lha.c	2016-06-28 22:40:33.000000000 -0700
-@@ -1715,7 +1715,7 @@
+@@ -1712,10 +1712,13 @@
+ 	for (;len >= 8; len -= 8) {
+ 		/* This if statement expects compiler optimization will
+ 		 * remove the stament which will not be executed. */
++#ifndef __has_builtin
++#define __has_builtin(x) 0
++#endif
  #if defined(_MSC_VER) && _MSC_VER >= 1400  /* Visual Studio */
  #  define bswap16(x) _byteswap_ushort(x)
  #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8) \
 -      || defined(__clang__)
-+      || (defined(__clang__) && defined(__has_builtin) && __has_builtin(__builtin_bswap16))
++      || (defined(__clang__) && __has_builtin(__builtin_bswap16))
  #  define bswap16(x) __builtin_bswap16(x)
  #else
  #  define bswap16(x) ((((x) >> 8) & 0xff) | ((x) << 8))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160705/763dd206/attachment.html>