diff libevent-1.3b/configure.in libevent-1.3b-gcc/configure.in
338,341d337
< AC_CHECK_TYPE(u_int64_t, unsigned long long)
< AC_CHECK_TYPE(u_int32_t, unsigned int)
< AC_CHECK_TYPE(u_int16_t, unsigned short)
< AC_CHECK_TYPE(u_int8_t, unsigned char)

diff libevent-1.3b/devpoll.c libevent-1.3b-gcc/devpoll.c
30a31
> #include <sys/tree.h>
49a51
> #include "event-internal.h"

diff libevent-1.3b/event.h libevent-1.3b-gcc/event.h
34a35
> #include <stdint.h>
302,303c303,304
< void evtag_marshal(struct evbuffer *evbuf, u_int8_t tag, const void *data,
<     u_int32_t len);
---
> void evtag_marshal(struct evbuffer *evbuf, uint8_t tag, const void *data,
>     uint32_t len);
305c306
< void encode_int(struct evbuffer *evbuf, u_int32_t number);
---
> void encode_int(struct evbuffer *evbuf, uint32_t number);
307,308c308,309
< void evtag_marshal_int(struct evbuffer *evbuf, u_int8_t tag,
<     u_int32_t integer);
---
> void evtag_marshal_int(struct evbuffer *evbuf, uint8_t tag,
>     uint32_t integer);
310c311
< void evtag_marshal_string(struct evbuffer *buf, u_int8_t tag,
---
> void evtag_marshal_string(struct evbuffer *buf, uint8_t tag,
313c314
< void evtag_marshal_timeval(struct evbuffer *evbuf, u_int8_t tag,
---
> void evtag_marshal_timeval(struct evbuffer *evbuf, uint8_t tag,
318c319
< int evtag_unmarshal(struct evbuffer *src, u_int8_t *ptag,
---
> int evtag_unmarshal(struct evbuffer *src, uint8_t *ptag,
320,322c321,323
< int evtag_peek(struct evbuffer *evbuf, u_int8_t *ptag);
< int evtag_peek_length(struct evbuffer *evbuf, u_int32_t *plength);
< int evtag_payload_length(struct evbuffer *evbuf, u_int32_t *plength);
---
> int evtag_peek(struct evbuffer *evbuf, uint8_t *ptag);
> int evtag_peek_length(struct evbuffer *evbuf, uint32_t *plength);
> int evtag_payload_length(struct evbuffer *evbuf, uint32_t *plength);
325,326c326,327
< int evtag_unmarshal_int(struct evbuffer *evbuf, u_int8_t need_tag,
<     u_int32_t *pinteger);
---
> int evtag_unmarshal_int(struct evbuffer *evbuf, uint8_t need_tag,
>     uint32_t *pinteger);
328c329
< int evtag_unmarshal_fixed(struct evbuffer *src, u_int8_t need_tag, void *data,
---
> int evtag_unmarshal_fixed(struct evbuffer *src, uint8_t need_tag, void *data,
331c332
< int evtag_unmarshal_string(struct evbuffer *evbuf, u_int8_t need_tag,
---
> int evtag_unmarshal_string(struct evbuffer *evbuf, uint8_t need_tag,
334c335
< int evtag_unmarshal_timeval(struct evbuffer *evbuf, u_int8_t need_tag,
---
> int evtag_unmarshal_timeval(struct evbuffer *evbuf, uint8_t need_tag,

diff libevent-1.3b/event_rpcgen.py libevent-1.3b-gcc/event_rpcgen.py
1c1
< #!/usr/bin/env python
---
> #!/usr/sfw/bin/python
85c85
<             print >>file, '  u_int8_t %s_set;' % entry.Name()
---
>             print >>file, '  uint8_t %s_set;' % entry.Name()
98c98
<         print >>file, ('void evtag_marshal_%s(struct evbuffer *, u_int8_t, '
---
>         print >>file, ('void evtag_marshal_%s(struct evbuffer *, uint8_t, '
100c100
<         print >>file, ('int evtag_unmarshal_%s(struct evbuffer *, u_int8_t, '
---
>         print >>file, ('int evtag_unmarshal_%s(struct evbuffer *, uint8_t, '
201c201
<                        '  u_int8_t tag;\n'
---
>                        '  uint8_t tag;\n'
250c250
<             'evtag_unmarshal_%s(struct evbuffer *evbuf, u_int8_t need_tag, '
---
>             'evtag_unmarshal_%s(struct evbuffer *evbuf, uint8_t need_tag, '
255c255
<             '  u_int8_t tag;\n'
---
>             '  uint8_t tag;\n'
277c277
<             'evtag_marshal_%s(struct evbuffer *evbuf, u_int8_t tag, '
---
>             'evtag_marshal_%s(struct evbuffer *evbuf, uint8_t tag, '
428c428
<         self._ctype = 'u_int8_t'
---
>         self._ctype = 'uint8_t'
441c441
<         dcl  = ['u_int8_t %s_data[%s];' % (self._name, self._length)]
---
>         dcl  = ['uint8_t %s_data[%s];' % (self._name, self._length)]
516c516
<         self._ctype = 'u_int32_t'
---
>         self._ctype = 'uint32_t'
533c533
<         dcl  = ['u_int32_t %s_data;' % self._name]
---
>         dcl  = ['uint32_t %s_data;' % self._name]
747c747
<         self._ctype = 'u_int8_t *'
---
>         self._ctype = 'uint8_t *'
750c750
<         code = [ 'int %s(struct %s *, %s *, u_int32_t *);' % (
---
>         code = [ 'int %s(struct %s *, %s *, uint32_t *);' % (
755c755
<         code = [ 'int %s(struct %s *, const %s, u_int32_t);' % (
---
>         code = [ 'int %s(struct %s *, const %s, uint32_t);' % (
763c763
<                  'const %s value, u_int32_t len)' % (
---
>                  'const %s value, uint32_t len)' % (
782c782
<                  '%s_%s_get(struct %s *msg, %s *value, u_int32_t *plen)' % (
---
>                  '%s_%s_get(struct %s *msg, %s *value, uint32_t *plen)' % (
844,845c844,845
<         dcl  = ['u_int8_t *%s_data;' % self._name,
<                 'u_int32_t %s_length;' % self._name]
---
>         dcl  = ['uint8_t *%s_data;' % self._name,
>                 'uint32_t %s_length;' % self._name]

diff libevent-1.3b/event_tagging.c libevent-1.3b-gcc/event_tagging.c
61c61
< int decode_int(u_int32_t *pnumber, struct evbuffer *evbuf);
---
> int decode_int(uint32_t *pnumber, struct evbuffer *evbuf);
82c82
< encode_int(struct evbuffer *evbuf, u_int32_t number)
---
> encode_int(struct evbuffer *evbuf, uint32_t number)
85c85
< 	u_int8_t data[5];
---
> 	uint8_t data[5];
114,115c114,115
< evtag_marshal(struct evbuffer *evbuf, u_int8_t tag,
<     const void *data, u_int32_t len)
---
> evtag_marshal(struct evbuffer *evbuf, uint8_t tag,
>     const void *data, uint32_t len)
124c124
< evtag_marshal_int(struct evbuffer *evbuf, u_int8_t tag, u_int32_t integer)
---
> evtag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer)
135c135
< evtag_marshal_string(struct evbuffer *buf, u_int8_t tag, const char *string)
---
> evtag_marshal_string(struct evbuffer *buf, uint8_t tag, const char *string)
141c141
< evtag_marshal_timeval(struct evbuffer *evbuf, u_int8_t tag, struct timeval *tv)
---
> evtag_marshal_timeval(struct evbuffer *evbuf, uint8_t tag, struct timeval *tv)
152,153c152,153
< static int __inline
< decode_int_internal(u_int32_t *pnumber, struct evbuffer *evbuf, int dodrain)
---
> static int inline
> decode_int_internal(uint32_t *pnumber, struct evbuffer *evbuf, int dodrain)
155,156c155,156
< 	u_int32_t number = 0;
< 	u_int8_t *data = EVBUFFER_DATA(evbuf);
---
> 	uint32_t number = 0;
> 	uint8_t *data = EVBUFFER_DATA(evbuf);
187c187
< decode_int(u_int32_t *pnumber, struct evbuffer *evbuf)
---
> decode_int(uint32_t *pnumber, struct evbuffer *evbuf)
193c193
< evtag_peek(struct evbuffer *evbuf, u_int8_t *ptag)
---
> evtag_peek(struct evbuffer *evbuf, uint8_t *ptag)
203c203
< evtag_peek_length(struct evbuffer *evbuf, u_int32_t *plength)
---
> evtag_peek_length(struct evbuffer *evbuf, uint32_t *plength)
225c225
< evtag_payload_length(struct evbuffer *evbuf, u_int32_t *plength)
---
> evtag_payload_length(struct evbuffer *evbuf, uint32_t *plength)
247c247
< 	u_int32_t len;
---
> 	uint32_t len;
259c259
< evtag_unmarshal(struct evbuffer *src, u_int8_t *ptag, struct evbuffer *dst)
---
> evtag_unmarshal(struct evbuffer *src, uint8_t *ptag, struct evbuffer *dst)
261,263c261,263
< 	u_int8_t tag;
< 	u_int32_t len;
< 	u_int32_t integer;
---
> 	uint8_t tag;
> 	uint32_t len;
> 	uint32_t integer;
286,287c286,287
< evtag_unmarshal_int(struct evbuffer *evbuf, u_int8_t need_tag,
<     u_int32_t *pinteger)
---
> evtag_unmarshal_int(struct evbuffer *evbuf, uint8_t need_tag,
>     uint32_t *pinteger)
289,291c289,291
< 	u_int8_t tag;
< 	u_int32_t len;
< 	u_int32_t integer;
---
> 	uint8_t tag;
> 	uint32_t len;
> 	uint32_t integer;
315c315
< evtag_unmarshal_fixed(struct evbuffer *src, u_int8_t need_tag, void *data,
---
> evtag_unmarshal_fixed(struct evbuffer *src, uint8_t need_tag, void *data,
318c318
< 	u_int8_t tag;
---
> 	uint8_t tag;
335c335
< evtag_unmarshal_string(struct evbuffer *evbuf, u_int8_t need_tag,
---
> evtag_unmarshal_string(struct evbuffer *evbuf, uint8_t need_tag,
338c338
< 	u_int8_t tag;
---
> 	uint8_t tag;
354c354
< evtag_unmarshal_timeval(struct evbuffer *evbuf, u_int8_t need_tag,
---
> evtag_unmarshal_timeval(struct evbuffer *evbuf, uint8_t need_tag,
357,358c357,358
< 	u_int8_t tag;
< 	u_int32_t integer;
---
> 	uint8_t tag;
> 	uint32_t integer;

diff libevent-1.3b/evsignal.h libevent-1.3b-gcc/evsignal.h
29a30,31
> #include <signal.h>
> 

diff libevent-1.3b/http.c libevent-1.3b-gcc/http.c
1572c1572
< static __inline void
---
> static inline void