Module Name: src Committed By: christos Date: Sun Dec 2 00:40:40 UTC 2018
Modified Files: src/sys/sys: videoio.h Log Message: protect linux sized types from redefinition To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/sys/videoio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/sys/videoio.h diff -u src/sys/sys/videoio.h:1.10 src/sys/sys/videoio.h:1.11 --- src/sys/sys/videoio.h:1.10 Mon Oct 2 09:47:58 2017 +++ src/sys/sys/videoio.h Sat Dec 1 19:40:40 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: videoio.h,v 1.10 2017/10/02 13:47:58 jmcneill Exp $ */ +/* $NetBSD: videoio.h,v 1.11 2018/12/02 00:40:40 christos Exp $ */ /*- * Copyright (c) 2005, 2008 Jared D. McNeill <jmcne...@invisible.ca> @@ -38,6 +38,8 @@ #endif #ifndef _KERNEL +#ifndef __linux_sized_types__ +#define __linux_sized_types__ #define __u64 uint64_t #define __u32 uint32_t #define __u16 uint16_t @@ -46,6 +48,7 @@ #define __s32 int32_t #define __s16 int16_t #define __s8 int8_t +#endif /* __linux_sized_types__ */ #endif typedef uint64_t v4l2_std_id;