head	1.3;
access;
symbols
	pkgsrc-2015Q3:1.2.0.30
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.28
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.26
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.24
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.22
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.20
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.18
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.16
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.14
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.12
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.10
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.6
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.4
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.2
	pkgsrc-2012Q1-base:1.2
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.3
date	2015.10.25.10.53.18;	author wiz;	state dead;
branches;
next	1.2;
commitid	lsG7QXEk8Q3RKtGy;

1.2
date	2012.03.20.12.06.17;	author obache;	state Exp;
branches;
next	1.1;

1.1
date	2012.02.21.12.49.43;	author drochner;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2012.02.21.12.49.43;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Finish move of vlc2 to vlc20.
@
text
@$NetBSD: patch-av,v 1.2 2012/03/20 12:06:17 obache Exp $

--- include/vlc_common.h.orig	2011-12-11 22:34:47.000000000 +0000
+++ include/vlc_common.h
@@@@ -51,6 +51,9 @@@@
 #include <stdio.h>
 #include <inttypes.h>
 #include <stddef.h>
+#ifdef __NetBSD__
+#include <sys/param.h>
+#endif
 
 #ifndef __cplusplus
 # include <stdbool.h>
@@@@ -625,6 +628,8 @@@@ static inline unsigned clz (unsigned x)
 /* XXX: this assumes that int is 32-bits or more */
 #define clz32( x ) (clz(x) - ((sizeof(unsigned) - sizeof (uint32_t)) * 8))
 
+#if !defined(__NetBSD_Version__) || (__NetBSD_Version__ < 599001600)
+
 /** Bit weight */
 VLC_USED
 static inline unsigned popcount (unsigned x)
@@@@ -641,6 +646,7 @@@@ static inline unsigned popcount (unsigne
     return count;
 #endif
 }
+#endif /* NetBSD < 5.99.16 */
 
 #ifdef __OS2__
 #   undef bswap16
@@@@ -648,6 +654,8 @@@@ static inline unsigned popcount (unsigne
 #   undef bswap64
 #endif
 
+#ifndef __NetBSD__
+
 /** Byte swap (16 bits) */
 VLC_USED
 static inline uint16_t bswap16 (uint16_t x)
@@@@ -696,6 +704,7 @@@@ static inline uint64_t bswap64 (uint64_t
 #endif
 }
 
+#endif /* NetBSD */
 
 /* Free and set set the variable to NULL */
 #define FREENULL(a) do { free( a ); a = NULL; } while(0)
@


1.2
log
@NetBSD<5.99.16 does not have popcount(3).
fixes PR 46230.
@
text
@d1 1
a1 1
$NetBSD: patch-av,v 1.1.1.1 2012/02/21 12:49:43 drochner Exp $
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
d5 11
a15 1
@@@@ -625,6 +625,8 @@@@ static inline unsigned clz (unsigned x)
d19 1
a19 1
+#ifndef __NetBSD__
d24 18
a41 1
@@@@ -696,6 +698,7 @@@@ static inline uint64_t bswap64 (uint64_t
@


1.1.1.1
log
@add vlc-2.0.0. This may need some polishing and fixes; while it works
well mostly it is not ready to replace vlc-1.1 yet.
@
text
@@