diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-12 16:04:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-12 16:04:36 +0100 |
| commit | ca3d87d4c84032f19478010b5604cac88b045c25 (patch) | |
| tree | 697ae6ccd736bad9d602e3872b372a4939d6af80 /slirp/socket.h | |
| parent | 7d820b766a2049f33ca7e078aa51018f2335f8c5 (diff) | |
| parent | 82751a32be872e71c22167234ac88ba52bf96a37 (diff) | |
| download | qemu-ca3d87d4c84032f19478010b5604cac88b045c25.zip qemu-ca3d87d4c84032f19478010b5604cac88b045c25.tar.gz qemu-ca3d87d4c84032f19478010b5604cac88b045c25.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-include-2016-07-12' into staging
Clean up #include "..." vs <...> and header guards
# gpg: Signature made Tue 12 Jul 2016 15:23:43 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-include-2016-07-12:
cris: Fix broken header guard in hw/cris/boot.h
Clean up decorations and whitespace around header guards
Clean up ill-advised or unusual header guards
libdecnumber: Don't error out on decNumberLocal.h re-inclusion
libdecnumber: Don't fool around with guards to avoid #include
Clean up header guards that don't match their file name
Drop Emacs local variables lists redundant with .dir-locals.el
spapr_pci: Include spapr.h instead of playing games with #error
tcg: Clean up tcg-target.h header guards
linux-user: Fix broken header guard in syscall_defs.h
linux-user: Clean up hostdep.h header guards
linux-user: Clean up target_structs.h header guards
linux-user: Clean up target_signal.h header guards
linux-user: Clean up target_cpu.h header guards
linux-user: Clean up target_syscall.h header guards
target-*: Clean up cpu.h header guards
scripts: New clean-header-guards.pl
Use #include "..." for our own headers, <...> for others
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/socket.h')
| -rw-r--r-- | slirp/socket.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/slirp/socket.h b/slirp/socket.h index b602e69..8feed2a 100644 --- a/slirp/socket.h +++ b/slirp/socket.h @@ -5,8 +5,8 @@ * terms and conditions of the copyright. */ -#ifndef _SLIRP_SOCKET_H_ -#define _SLIRP_SOCKET_H_ +#ifndef SLIRP_SOCKET_H +#define SLIRP_SOCKET_H #define SO_EXPIRE 240000 #define SO_EXPIREFAST 10000 @@ -158,4 +158,4 @@ void sotranslate_in(struct socket *, struct sockaddr_storage *); void sotranslate_accept(struct socket *); -#endif /* _SOCKET_H_ */ +#endif /* SLIRP_SOCKET_H */ |