diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-28 15:45:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 15:45:29 +0100 |
| commit | dc8610577e39510914afab337538d233dc6e4832 (patch) | |
| tree | 23a846f936543aa3ab37c6384bc5ed52d02bdc8f /vespalib | |
| parent | 98167b26a57e9413bf2d4ea71e99228a825432b9 (diff) | |
| parent | ddd8f0e9a70aa1099133bc6893ca7c488653bb5b (diff) | |
Merge pull request #26227 from vespa-engine/balder/remove-fastos-types
Remove fastos/types.
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/vespa/fastos/file.h | 3 | ||||
| -rw-r--r-- | vespalib/src/vespa/fastos/types.h | 9 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp | 1 |
3 files changed, 2 insertions, 11 deletions
diff --git a/vespalib/src/vespa/fastos/file.h b/vespalib/src/vespa/fastos/file.h index 1cf6fee71dd..146127d4fe6 100644 --- a/vespalib/src/vespa/fastos/file.h +++ b/vespalib/src/vespa/fastos/file.h @@ -10,10 +10,11 @@ #pragma once -#include "types.h" #include <cstdint> #include <string> +#define FASTOS_PREFIX(a) FastOS_##a + constexpr int FASTOS_FILE_OPEN_READ = (1<<0); constexpr int FASTOS_FILE_OPEN_WRITE = (1<<1); constexpr int FASTOS_FILE_OPEN_EXISTING = (1<<2); diff --git a/vespalib/src/vespa/fastos/types.h b/vespalib/src/vespa/fastos/types.h deleted file mode 100644 index 69dd3e5231c..00000000000 --- a/vespalib/src/vespa/fastos/types.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#pragma once - -#define FASTOS_PREFIX(a) FastOS_##a - -// New macros to support the new gcc visibility features. -#define VESPA_DLL_EXPORT __attribute__ ((visibility("default"))) -#define VESPA_DLL_LOCAL __attribute__ ((visibility("hidden"))) diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp b/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp index f5d87e14802..3bdbb7a81ff 100644 --- a/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp +++ b/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp @@ -3,7 +3,6 @@ #pragma once #include "private_helpers.hpp" -#include <vespa/fastos/types.h> namespace vespalib::hwaccelrated::avx { |