comparison includes.h @ 910:89555751c489 asm

merge up to 2013.63, improve ASM makefile rules a bit
author Matt Johnston <matt@ucc.asn.au>
date Thu, 27 Feb 2014 21:35:58 +0800
parents 5d3e917bb7a6
children deed0571cacc
comparison
equal deleted inserted replaced
909:e4b75744acab 910:89555751c489
132 #include <tommath.h> 132 #include <tommath.h>
133 #endif 133 #endif
134 134
135 135
136 #include "compat.h" 136 #include "compat.h"
137 #include "fake-rfc2553.h"
138 137
139 #ifndef HAVE_UINT16_T 138 #ifndef HAVE_U_INT8_T
139 typedef unsigned char u_int8_t;
140 #endif /* HAVE_U_INT8_T */
141 #ifndef HAVE_UINT8_T
142 typedef u_int8_t uint8_t;
143 #endif /* HAVE_UINT8_T */
144
140 #ifndef HAVE_U_INT16_T 145 #ifndef HAVE_U_INT16_T
141 typedef unsigned short u_int16_t; 146 typedef unsigned short u_int16_t;
142 #endif /* HAVE_U_INT16_T */ 147 #endif /* HAVE_U_INT16_T */
148 #ifndef HAVE_UINT16_T
143 typedef u_int16_t uint16_t; 149 typedef u_int16_t uint16_t;
144 #endif /* HAVE_UINT16_T */ 150 #endif /* HAVE_UINT16_T */
151
152 #ifndef HAVE_U_INT32_T
153 typedef unsigned int u_int32_t;
154 #endif /* HAVE_U_INT32_T */
155 #ifndef HAVE_UINT32_T
156 typedef u_int32_t uint32_t;
157 #endif /* HAVE_UINT32_T */
158
159 #ifdef SO_PRIORITY
160 #include <linux/types.h>
161 #include <linux/pkt_sched.h>
162 #endif
163
164 #include "fake-rfc2553.h"
145 165
146 #ifndef LOG_AUTHPRIV 166 #ifndef LOG_AUTHPRIV
147 #define LOG_AUTHPRIV LOG_AUTH 167 #define LOG_AUTHPRIV LOG_AUTH
148 #endif 168 #endif
149 169