svn commit: r481896 - branches/2018Q4/security/nss/files

[Jan Beich]

Author: jbeich
Date: Fri Oct 12 11:51:27 2018
New Revision: 481896
URL: https://svnweb.freebsd.org/changeset/ports/481896

Log:
  MFH: r481895
  
  security/nss: unbreak on powerpc64 after r405494
  
  mpi/mpcpucache.c:728:23: error: incompatible pointer types passing 'int *' to parameter of type 'size_t *' (aka 'unsigned long *') [-Werror,-Wincompatible-pointer-types]
              &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size)
                               ^~~~~
  /usr/include/sys/sysctl.h:1062:48: note: passing argument to parameter here
  int     sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
                                                     ^
  PR:		147696 (typo origin)
  Reported by:	Mark Millard
  Approved by:	ports-secteam blanket

Modified:
  branches/2018Q4/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c
==============================================================================
--- branches/2018Q4/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c	Fri Oct 12 11:50:45 2018	(r481895)
+++ branches/2018Q4/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c	Fri Oct 12 11:51:27 2018	(r481896)
@@ -17,7 +17,7 @@
 +{
 +	static int cacheline_size = 0;
 +	static int cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
-+	int clen;
++	size_t clen;
 +	
 +	if (cacheline_size > 0)
 +		return cacheline_size;