svn commit: r459569 - head/archivers/xmill/files

[Jan Beich]

Author: jbeich
Date: Sun Jan 21 02:23:59 2018
New Revision: 459569
URL: https://svnweb.freebsd.org/changeset/ports/459569

Log:
  archivers/xmill: unbreak build with Clang 6 (C++14 by default)
  
  ./xmillinspect/exprinfo.cpp:64:10: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
                  return NULL;
                         ^~~~
  /usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
   #define NULL    nullptr
                   ^~~~~~~
  
  Reported by:	pkg-fallout

Added:
  head/archivers/xmill/files/patch-xmillinspect_exprinfo.cpp   (contents, props changed)

Added: head/archivers/xmill/files/patch-xmillinspect_exprinfo.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/xmill/files/patch-xmillinspect_exprinfo.cpp	Sun Jan 21 02:23:59 2018	(r459569)
@@ -0,0 +1,18 @@
+./xmillinspect/exprinfo.cpp:64:10: error: cannot initialize return object of type 'int' with an rvalue of type 'nullptr_t'
+                return NULL;
+                       ^~~~
+/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
+#define NULL    nullptr
+                ^~~~~~~
+
+--- xmillinspect/exprinfo.cpp.orig	2003-03-23 15:06:16 UTC
++++ xmillinspect/exprinfo.cpp
+@@ -61,7 +61,7 @@ int ExprInfo::getSubContainerType(int sub)
+ 	if (expr) {
+ 		return expr->getContainerType();
+ 	} else {
+-		return NULL;
++		return 0;
+ 	}
+ }
+