svn commit: r320931 - head/contrib/libarchive/libarchive

[Martin Matuska]

Author: mm
Date: Thu Jul 13 04:42:29 2017
New Revision: 320931
URL: https://svnweb.freebsd.org/changeset/base/320931

Log:
  Fix libarchive mismerge of r320927
  
  MFC after:	1 week
  X-MFC-with:	320927
  Reported by:	Ngie Cooper <ngie at FreeBSD.org>

Modified:
  head/contrib/libarchive/libarchive/archive.h

Modified: head/contrib/libarchive/libarchive/archive.h
==============================================================================
--- head/contrib/libarchive/libarchive/archive.h	Thu Jul 13 03:52:54 2017	(r320930)
+++ head/contrib/libarchive/libarchive/archive.h	Thu Jul 13 04:42:29 2017	(r320931)
@@ -36,7 +36,7 @@
  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
  */
 /* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3003001
+#define	ARCHIVE_VERSION_NUMBER 3003002
 
 #include <sys/stat.h>
 #include <stddef.h>  /* for wchar_t */