← Back to branch summary

~ubuntu-branches/ubuntu/feisty/basilisk2/feisty

~ubuntu-branches/ubuntu/feisty/basilisk2/feisty

« back to all changes in this revision

Viewing changes to src/slirp/slirp.h

Committer: Bazaar Package Importer
Author(s): Jonas Smedegaard
Date: 2006-06-01 01:11:16 UTC
mfrom: (1.1.2 upstream)
Revision ID: james.westby@ubuntu.com-20060601011116-xjhegbgyfsxag5fl

Tags: 0.9.20060529-1

* New upstream CVS snapshot.
* Update local cdbs snippet copyright-check.mk:
  + Broaden scan to also look for "(c)" by default.
  + Make egrep options configurable.
  + Ignore auto-tools files.
* Bump up standards-version to 3.7.2 (no changes needed).
* Let dh_strip do the stripping (not the make install target).

files added:
debian/cdbs/1/rules/auto-update.mk

debian/cdbs/1/rules/copyright-check.mk

src/Unix/Darwin/gtk-osx.patch

src/Unix/Darwin/mkstandalone

src/Unix/ldscripts

src/Unix/ldscripts/freebsd-i386.ld

src/Unix/ldscripts/linux-i386.ld

src/Unix/ldscripts/linux-ppc.ld

src/Unix/ldscripts/linux-x86_64.ld

src/Unix/rpc.h

src/Unix/rpc_unix.cpp

src/Windows/BasiliskIIGUI.ico

src/Windows/BasiliskIIGUI.rc

files modified:
ChangeLog

ChangeLog.cvs

README

TODO

debian/cdbs/1/rules/bts.mk

debian/cdbs/1/rules/buildinfo.mk

debian/changelog

debian/control

debian/control.in

debian/copyright

debian/rules

src/AmigaOS/timer_amiga.cpp

src/BeOS/timer_beos.cpp

src/MacOSX/0_HOW_TO_BUILD.txt

src/MacOSX/1_prepare_files.sh

src/MacOSX/BasiliskII.pbproj/project.pbxproj

src/MacOSX/BasiliskII.xcode/project.pbxproj

src/MacOSX/Controller.mm

src/MacOSX/Credits.html

src/MacOSX/EmulatorView.mm

src/MacOSX/English.lproj/InfoPlist.strings

src/MacOSX/HowTo.html

src/MacOSX/Info.plist

src/MacOSX/Makefile.in

src/MacOSX/PrefsEditor.mm

src/MacOSX/ToDo.html

src/MacOSX/Versions.html

src/MacOSX/audio_defs_macosx.h

src/MacOSX/clip_macosx.cpp

src/MacOSX/configure.in

src/MacOSX/extfs_macosx.mm

src/MacOSX/main_macosx.mm

src/MacOSX/sys_darwin.cpp

src/SDL/audio_sdl.cpp *

src/SDL/video_sdl.cpp

src/Unix/Makefile.in

src/Unix/aclocal.m4

src/Unix/config.h.in

src/Unix/configure

src/Unix/configure.ac

src/Unix/ether_unix.cpp

src/Unix/m4/gtk.m4

src/Unix/main_unix.cpp

src/Unix/prefs_editor_gtk.cpp

src/Unix/prefs_unix.cpp

src/Unix/serial_unix.cpp

src/Unix/sigsegv.cpp

src/Unix/sys_unix.cpp

src/Unix/timer_unix.cpp

src/Unix/user_strings_unix.cpp

src/Unix/user_strings_unix.h

src/Unix/video_vosf.h

src/Unix/video_x.cpp

src/Unix/vm_alloc.cpp

src/Unix/vm_alloc.h

src/Windows/Makefile.in

src/Windows/clip_windows.cpp

src/Windows/configure.ac

src/Windows/ether_windows.cpp

src/Windows/ether_windows.h

src/Windows/main_windows.cpp

src/Windows/prefs_editor_gtk.cpp

src/Windows/prefs_windows.cpp

src/Windows/router/router.cpp

src/Windows/router/router.h

src/Windows/sys_windows.cpp

src/Windows/sysdeps.h

src/Windows/timer_windows.cpp

src/Windows/user_strings_windows.cpp

src/Windows/user_strings_windows.h

src/Windows/util_windows.cpp

src/Windows/util_windows.h

src/emul_op.cpp

src/extfs.cpp

src/include/emul_op.h

src/include/serial.h

src/include/sys.h

src/include/user_strings.h

src/powerrom_cpu/powerrom_cpu.cpp

src/prefs_items.cpp

src/rom_patches.cpp

src/rsrc_patches.cpp

src/slirp/bootp.h

src/slirp/if.c

src/slirp/ip.h

src/slirp/ip_icmp.h

src/slirp/ip_input.c

src/slirp/libslirp.h

src/slirp/mbuf.c

src/slirp/misc.c

src/slirp/misc.h

src/slirp/slirp.c

src/slirp/slirp.h

src/slirp/socket.c

src/slirp/tcp.h

src/slirp/tcp_input.c

src/slirp/tftp.h

src/slirp/udp.c

src/slirp/udp.h

src/uae_cpu/basilisk_glue.cpp

src/uae_cpu/compiler/codegen_x86.cpp

src/uae_cpu/compiler/codegen_x86.h

src/uae_cpu/compiler/compemu.h

src/uae_cpu/compiler/compemu_support.cpp

src/uae_cpu/fpu/types.h

src/uae_cpu/m68k.h

src/uae_cpu/newcpu.cpp

src/uae_cpu/newcpu.h

src/user_strings.cpp

Show diffs side-by-side

added added

removed removed

src/slirp/slirp.h

19

19

typedef uint32_t u_int32_t;

20

20

typedef uint64_t u_int64_t;

21

21

typedef char *caddr_t;

22

typedef int socklen_t;

23

typedef unsigned long ioctlsockopt_t;

22

24

23

25

# include <windows.h>

24

26

# include <winsock2.h>

25

27

# include <sys/timeb.h>

26

28

# include <iphlpapi.h>

27

29

30

# define USE_FIONBIO 1

28

31

# define EWOULDBLOCK WSAEWOULDBLOCK

29

32

# define EINPROGRESS WSAEINPROGRESS

30

33

# define ENOTCONN WSAENOTCONN

31

34

# define EHOSTUNREACH WSAEHOSTUNREACH

32

35

# define ENETUNREACH WSAENETUNREACH

33

36

# define ECONNREFUSED WSAECONNREFUSED

37

38

/* Basilisk II Router defines those */

39

# define udp_read_completion slirp_udp_read_completion

40

# define write_udp slirp_write_udp

41

# define init_udp slirp_init_udp

42

# define final_udp slirp_final_udp

34

43

#else

44

typedef int ioctlsockopt_t;

35

45

# define ioctlsocket ioctl

36

46

# define closesocket(s) close(s)

37

47

# define O_BINARY 0

38

48

#endif

39

49

40

#ifdef HAVE_STDINT_H

41

# include <stdint.h>

42

#endif

43

44

50

#include <sys/types.h>

45

51

#ifdef HAVE_SYS_BITYPES_H

46

52

# include <sys/bitypes.h>

47

53

#endif

54

#ifdef HAVE_STDINT_H

55

# include <stdint.h>

56

#endif

48

57

49

58

#include <sys/time.h>

50

59

77

86

# endif

78

87

#endif /* NEED_TYPEDEFS */

79

88

89

/* Basilisk II types glue */

90

typedef u_int8_t uint8;

91

typedef u_int16_t uint16;

92

typedef u_int32_t uint32;

93

80

94

#ifdef HAVE_UNISTD_H

81

95

# include <unistd.h>

82

96

#endif

196

210

197

211

#include "debug.h"

198

212

213

#if defined __GNUC__

214

#define PACKED__ __attribute__ ((packed))

215

#elif defined __sgi

216

#define PRAGMA_PACK_SUPPORTED 1

217

#define PACKED__

218

#else

219

#error "Packed attribute or pragma shall be supported"

220

#endif

221

199

222

#include "ip.h"

200

223

#include "tcp.h"

201

224

#include "tcp_timer.h"

Older »