From d4d47023f9bdb9d7f6e9ad682f027a2c57eb75b2 Mon Sep 17 00:00:00 2001 From: Christopher Dykes Date: Sun, 20 Mar 2016 11:06:40 -0700 Subject: [PATCH] Split iovec out of SysUio.h Summary: This is needed to avoid a circular dependency. Reviewed By: yfeldblum Differential Revision: D3072037 fb-gh-sync-id: 546a46fd68f25f0c5b027d4d938335b2711d8fdd shipit-source-id: 546a46fd68f25f0c5b027d4d938335b2711d8fdd --- folly/Makefile.am | 1 + folly/portability/IOVec.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100755 folly/portability/IOVec.h diff --git a/folly/Makefile.am b/folly/Makefile.am index fffd7edf..54b738d7 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -272,6 +272,7 @@ nobase_follyinclude_HEADERS = \ portability/Constexpr.h \ portability/Environment.h \ portability/GFlags.h \ + portability/IOVec.h \ portability/Memory.h \ portability/Strings.h \ portability/Syscall.h \ diff --git a/folly/portability/IOVec.h b/folly/portability/IOVec.h new file mode 100755 index 00000000..74e48098 --- /dev/null +++ b/folly/portability/IOVec.h @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Facebook, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#pragma once + +// This file only exists because without it there would be +// a circular dependency between SysUio.h, Sockets.h, and Unistd.h +#ifndef _WIN32 +#include +#else +#include + +#define UIO_MAXIOV 16 +#define IOV_MAX UIO_MAXIOV + +struct iovec { + void* iov_base; + size_t iov_len; +}; +#endif -- 2.34.1