mirror of
				https://github.com/Ysurac/openmptcprouter.git
				synced 2025-03-09 15:40:20 +00:00 
			
		
		
		
	
		
			
				
	
	
		
			93 lines
		
	
	
	
		
			2.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			93 lines
		
	
	
	
		
			2.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From 48232d3d931c95953ce2ddfe7da7bb164aef6a73 Mon Sep 17 00:00:00 2001
 | |
| From: Felix Fietkau <nbd@nbd.name>
 | |
| Date: Fri, 7 Jul 2017 17:03:16 +0200
 | |
| Subject: fix portability of some includes files in tools/ used on the host
 | |
| 
 | |
| Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | |
| ---
 | |
|  tools/include/tools/be_byteshift.h |  4 ++++
 | |
|  tools/include/tools/le_byteshift.h |  4 ++++
 | |
|  tools/include/tools/linux_types.h  | 22 ++++++++++++++++++++++
 | |
|  3 files changed, 30 insertions(+)
 | |
|  create mode 100644 tools/include/tools/linux_types.h
 | |
| 
 | |
| --- a/tools/include/tools/be_byteshift.h
 | |
| +++ b/tools/include/tools/be_byteshift.h
 | |
| @@ -2,6 +2,10 @@
 | |
|  #ifndef _TOOLS_BE_BYTESHIFT_H
 | |
|  #define _TOOLS_BE_BYTESHIFT_H
 | |
|  
 | |
| +#ifndef __linux__
 | |
| +#include "linux_types.h"
 | |
| +#endif
 | |
| +
 | |
|  #include <stdint.h>
 | |
|  
 | |
|  static inline uint16_t __get_unaligned_be16(const uint8_t *p)
 | |
| --- a/tools/include/tools/le_byteshift.h
 | |
| +++ b/tools/include/tools/le_byteshift.h
 | |
| @@ -2,6 +2,10 @@
 | |
|  #ifndef _TOOLS_LE_BYTESHIFT_H
 | |
|  #define _TOOLS_LE_BYTESHIFT_H
 | |
|  
 | |
| +#ifndef __linux__
 | |
| +#include "linux_types.h"
 | |
| +#endif
 | |
| +
 | |
|  #include <stdint.h>
 | |
|  
 | |
|  static inline uint16_t __get_unaligned_le16(const uint8_t *p)
 | |
| --- /dev/null
 | |
| +++ b/tools/include/tools/linux_types.h
 | |
| @@ -0,0 +1,26 @@
 | |
| +#ifndef __LINUX_TYPES_H
 | |
| +#define __LINUX_TYPES_H
 | |
| +
 | |
| +#include <stdint.h>
 | |
| +
 | |
| +typedef int8_t __s8;
 | |
| +typedef uint8_t __u8;
 | |
| +typedef uint8_t __be8;
 | |
| +typedef uint8_t __le8;
 | |
| +
 | |
| +typedef int16_t __s16;
 | |
| +typedef uint16_t __u16;
 | |
| +typedef uint16_t __be16;
 | |
| +typedef uint16_t __le16;
 | |
| +
 | |
| +typedef int32_t __s32;
 | |
| +typedef uint32_t __u32;
 | |
| +typedef uint32_t __be32;
 | |
| +typedef uint32_t __le32;
 | |
| +
 | |
| +typedef int64_t __s64;
 | |
| +typedef uint64_t __u64;
 | |
| +typedef uint64_t __be64;
 | |
| +typedef uint64_t __le64;
 | |
| +
 | |
| +#endif
 | |
| --- a/tools/include/linux/types.h
 | |
| +++ b/tools/include/linux/types.h
 | |
| @@ -10,8 +10,12 @@
 | |
|  #define __SANE_USERSPACE_TYPES__	/* For PPC64, to get LL64 types */
 | |
|  #endif
 | |
|  
 | |
| +#ifndef __linux__
 | |
| +#include <tools/linux_types.h>
 | |
| +#else
 | |
|  #include <asm/types.h>
 | |
|  #include <asm/posix_types.h>
 | |
| +#endif
 | |
|  
 | |
|  struct page;
 | |
|  struct kmem_cache;
 | |
| --- a/tools/perf/pmu-events/jevents.py
 | |
| +++ b/tools/perf/pmu-events/jevents.py
 | |
| @@ -684,6 +684,7 @@ def main() -> None:
 | |
|  #include "util/header.h"
 | |
|  #include "util/pmu.h"
 | |
|  #include <string.h>
 | |
| +#include <strings.h>
 | |
|  #include <stddef.h>
 | |
|  
 | |
|  struct compact_pmu_event {
 |