blob: 1c67d574fd8c991937b3b769a5af9a885f21327a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
commit 4928bab9086d6e9610413f15675babdf5566c5ce
Author: Isaac Dunham <ibid.ag@gmail.com>
Date: Fri Sep 12 21:19:19 2014 -0700
Uncruftify: remove __ from uint*_t
diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
index 5c3d654..fd38b2f 100644
--- a/src/core/device-tree.cc
+++ b/src/core/device-tree.cc
@@ -24,13 +24,13 @@
__ID("@(#) $Id: device-tree.cc 2521 2013-05-08 13:43:30Z lyonel $");
#define DIMMINFOSIZE 0x80
-typedef __uint8_t dimminfo_buf[DIMMINFOSIZE];
+typedef uint8_t dimminfo_buf[DIMMINFOSIZE];
struct dimminfo
{
- __uint8_t version3;
+ uint8_t version3;
char serial[16];
- __uint16_t version1, version2;
+ uint16_t version1, version2;
};
#define DEVICETREE "/proc/device-tree"
diff --git a/src/core/network.cc b/src/core/network.cc
index 134c887..a298d35 100644
--- a/src/core/network.cc
+++ b/src/core/network.cc
@@ -49,9 +49,9 @@ __ID("@(#) $Id: network.cc 2516 2013-02-03 16:43:25Z lyonel $");
#define SIOCETHTOOL 0x8946
#endif
typedef unsigned long long u64;
-typedef __uint32_t u32;
-typedef __uint16_t u16;
-typedef __uint8_t u8;
+typedef uint32_t u32;
+typedef uint16_t u16;
+typedef uint8_t u8;
struct ethtool_cmd
{
diff --git a/src/core/osutils.cc b/src/core/osutils.cc
index fd19288..f9ce76c 100644
--- a/src/core/osutils.cc
+++ b/src/core/osutils.cc
@@ -496,48 +496,48 @@ string escapecomment(const string & s)
unsigned short be_short(const void * from)
{
- __uint8_t *p = (__uint8_t*)from;
+ uint8_t *p = (uint8_t*)from;
- return ((__uint16_t)(p[0]) << 8) +
- (__uint16_t)p[1];
+ return ((uint16_t)(p[0]) << 8) +
+ (uint16_t)p[1];
}
unsigned short le_short(const void * from)
{
- __uint8_t *p = (__uint8_t*)from;
+ uint8_t *p = (uint8_t*)from;
- return ((__uint16_t)(p[1]) << 8) +
- (__uint16_t)p[0];
+ return ((uint16_t)(p[1]) << 8) +
+ (uint16_t)p[0];
}
unsigned long be_long(const void * from)
{
- __uint8_t *p = (__uint8_t*)from;
+ uint8_t *p = (uint8_t*)from;
- return ((__uint32_t)(p[0]) << 24) +
- ((__uint32_t)(p[1]) << 16) +
- ((__uint32_t)(p[2]) << 8) +
- (__uint32_t)p[3];
+ return ((uint32_t)(p[0]) << 24) +
+ ((uint32_t)(p[1]) << 16) +
+ ((uint32_t)(p[2]) << 8) +
+ (uint32_t)p[3];
}
unsigned long le_long(const void * from)
{
- __uint8_t *p = (__uint8_t*)from;
+ uint8_t *p = (uint8_t*)from;
- return ((__uint32_t)(p[3]) << 24) +
- ((__uint32_t)(p[2]) << 16) +
- ((__uint32_t)(p[1]) << 8) +
- (__uint32_t)p[0];
+ return ((uint32_t)(p[3]) << 24) +
+ ((uint32_t)(p[2]) << 16) +
+ ((uint32_t)(p[1]) << 8) +
+ (uint32_t)p[0];
}
unsigned long long be_longlong(const void * from)
{
- __uint8_t *p = (__uint8_t*)from;
+ uint8_t *p = (uint8_t*)from;
return ((unsigned long long)(p[0]) << 56) +
((unsigned long long)(p[1]) << 48) +
@@ -552,7 +552,7 @@ unsigned long long be_longlong(const void * from)
unsigned long long le_longlong(const void * from)
{
- __uint8_t *p = (__uint8_t*)from;
+ uint8_t *p = (uint8_t*)from;
return ((unsigned long long)(p[7]) << 56) +
((unsigned long long)(p[6]) << 48) +
|
