Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/sys protect linux sized types from redefinition



details:   https://anonhg.NetBSD.org/src/rev/25e4eeefe06d
branches:  trunk
changeset: 446355:25e4eeefe06d
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Dec 02 00:40:40 2018 +0000

description:
protect linux sized types from redefinition

diffstat:

 sys/sys/videoio.h |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r 2e8635cc9c59 -r 25e4eeefe06d sys/sys/videoio.h
--- a/sys/sys/videoio.h Sat Dec 01 20:38:45 2018 +0000
+++ b/sys/sys/videoio.h Sun Dec 02 00:40:40 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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;



Home | Main Index | Thread Index | Old Index