diff options
| author | Björn Jacke <bj@sernet.de> | 2012-10-30 11:32:52 +0100 |
|---|---|---|
| committer | Bjoern Jacke <bj@sernet.de> | 2012-10-30 13:18:50 +0100 |
| commit | 0342ca40629d5a57db02c7f840809dfa0bde6780 (patch) | |
| tree | 459c92c3d1ae60614fe27e9c9b179677b4a2d900 | |
| parent | a3a1cd4797c99cb5fd0234c2dfe40e5dcafb05f8 (diff) | |
| download | samba-0342ca40629d5a57db02c7f840809dfa0bde6780.tar.gz samba-0342ca40629d5a57db02c7f840809dfa0bde6780.tar.bz2 samba-0342ca40629d5a57db02c7f840809dfa0bde6780.zip | |
wfabuild: fix the -errwarn compile flag test
as in the autoconf build this must be "-errwarn=%all"
| -rw-r--r-- | lib/replace/wscript | 2 | ||||
| -rw-r--r-- | lib/util/util_net.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index c21a8f87e9..7c2d5191d7 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -54,7 +54,7 @@ struct foo bar = { .y = 'X', .x = 1 }; break # Try to find the right extra flags for -Werror behaviour - for f in ["-Werror", "-w2", "-errwarn"]: + for f in ["-Werror", "-w2", "-errwarn=%all"]: if conf.CHECK_CFLAGS([f], ''' '''): if not 'WERROR_CFLAGS' in conf.env: diff --git a/lib/util/util_net.c b/lib/util/util_net.c index 83afda4c78..536c0a4e2b 100644 --- a/lib/util/util_net.c +++ b/lib/util/util_net.c @@ -817,6 +817,9 @@ static const smb_socket_option socket_options[] = { #ifdef TCP_QUICKACK {"TCP_QUICKACK", IPPROTO_TCP, TCP_QUICKACK, 0, OPT_BOOL}, #endif +#ifdef TCP_FASTOPEN + {"TCP_FASTOPEN", IPPROTO_TCP, TCP_FASTOPEN, 0, OPT_BOOL}, +#endif #ifdef TCP_NODELAYACK {"TCP_NODELAYACK", IPPROTO_TCP, TCP_NODELAYACK, 0, OPT_BOOL}, #endif |