Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Oct 2018 11:50:45 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r481895 - head/security/nss/files
Message-ID:  <201810121150.w9CBojZe081997@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Oct 12 11:50:45 2018
New Revision: 481895
URL: https://svnweb.freebsd.org/changeset/ports/481895

Log:
  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

Modified:
  head/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c   (contents, props changed)

Modified: head/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c
==============================================================================
--- head/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c	Fri Oct 12 11:46:32 2018	(r481894)
+++ head/security/nss/files/patch-lib_freebl_mpi_mpcpucache.c	Fri Oct 12 11:50:45 2018	(r481895)
@@ -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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810121150.w9CBojZe081997>