|
| 1 | +diff --git a/include/openssl/base.h b/include/openssl/base.h |
| 2 | +index a9d1ec58..d121b6fb 100644 |
| 3 | +--- include/openssl/base.h |
| 4 | ++++ include/openssl/base.h |
| 5 | +@@ -65,6 +65,10 @@ |
| 6 | + #include <stdio.h> |
| 7 | + #endif |
| 8 | + |
| 9 | ++/* Include a BoringSSL-only header so consumers including this header without |
| 10 | ++ * setting up include paths do not accidentally pick up the system |
| 11 | ++ * opensslconf.h. */ |
| 12 | ++#include <openssl/is_boringssl.h> |
| 13 | + #include <openssl/opensslconf.h> |
| 14 | + |
| 15 | + #if defined(BORINGSSL_PREFIX) |
| 16 | +diff --git a/include/openssl/is_boringssl.h b/include/openssl/is_boringssl.h |
| 17 | +new file mode 100644 |
| 18 | +index 00000000..def6e82b |
| 19 | +--- include/openssl/is_boringssl.h |
| 20 | ++++ include/openssl/is_boringssl.h |
| 21 | +@@ -0,0 +1,16 @@ |
| 22 | ++/* Copyright (c) 2017, Google Inc. |
| 23 | ++ * |
| 24 | ++ * Permission to use, copy, modify, and/or distribute this software for any |
| 25 | ++ * purpose with or without fee is hereby granted, provided that the above |
| 26 | ++ * copyright notice and this permission notice appear in all copies. |
| 27 | ++ * |
| 28 | ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
| 29 | ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
| 30 | ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY |
| 31 | ++ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
| 32 | ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION |
| 33 | ++ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN |
| 34 | ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ |
| 35 | ++ |
| 36 | ++/* This header is provided in order to catch include path errors in consuming |
| 37 | ++ * BoringSSL. */ |
| 38 | + |
0 commit comments