[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 58c9fdf 05/10: Make a precondition check unco
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 58c9fdf 05/10: Make a precondition check unconditional |
Date: |
Sat, 11 Mar 2017 17:24:20 -0500 (EST) |
branch: master
commit 58c9fdf54c49c236a49900535df324d9e78febf7
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Make a precondition check unconditional
It is an error if both LMI_BUILD_SO and LMI_USE_SO defined. Formerly,
this invariant was tested only for msw. Now it is always tested.
Incidentally, null directives have been inserted for clarity.
---
so_attributes.hpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/so_attributes.hpp b/so_attributes.hpp
index 9a64d96..560113f 100644
--- a/so_attributes.hpp
+++ b/so_attributes.hpp
@@ -72,10 +72,12 @@
#include "config.hpp"
#if defined LMI_USE_SO_ATTRIBUTES
+#
+# if defined LMI_BUILD_SO && defined LMI_USE_SO
+# error Both LMI_BUILD_SO and LMI_USE_SO defined.
+# endif // defined LMI_BUILD_SO && defined LMI_USE_SO
+#
# if defined LMI_MSW
-# if defined LMI_BUILD_SO && defined LMI_USE_SO
-# error Both LMI_BUILD_SO and LMI_USE_SO defined.
-# endif // defined LMI_BUILD_SO && defined LMI_USE_SO
# if defined LMI_BUILD_SO
# define LMI_SO __declspec(dllexport)
# elif defined LMI_USE_SO
@@ -92,6 +94,7 @@
# else // !defined LMI_MSW && !defined __GNUC__
# define LMI_SO
# endif // !defined LMI_MSW && !defined __GNUC__
+#
#else // !defined LMI_USE_SO_ATTRIBUTES
# define LMI_SO
#endif // !defined LMI_USE_SO_ATTRIBUTES
- [lmi-commits] [lmi] master updated (e41c2a5 -> 14a3331), Greg Chicares, 2017/03/11
- [lmi-commits] [lmi] master 4d5ba79 03/10: Improve #error messages, Greg Chicares, 2017/03/11
- [lmi-commits] [lmi] master a1d3016 01/10: Improve a MinGW conditional, Greg Chicares, 2017/03/11
- [lmi-commits] [lmi] master cdd64d2 04/10: Remove a superannuated gcc conditional, Greg Chicares, 2017/03/11
- [lmi-commits] [lmi] master 649d990 02/10: Improve documentation, Greg Chicares, 2017/03/11
- [lmi-commits] [lmi] master d5d71f8 08/10: Refactor for simplicity, Greg Chicares, 2017/03/11
- [lmi-commits] [lmi] master 58c9fdf 05/10: Make a precondition check unconditional,
Greg Chicares <=
- [lmi-commits] [lmi] master a4d4c24 06/10: Treat unknown platform as an error, uniformly, Greg Chicares, 2017/03/11
- [lmi-commits] [lmi] master b1c6af9 07/10: Use similar logic for ELF and PE-COFF, Greg Chicares, 2017/03/11
- [lmi-commits] [lmi] master b29be96 09/10: Extend in the spirit of ELF visibility, Greg Chicares, 2017/03/11
- [lmi-commits] [lmi] master 14a3331 10/10: Reuse recent so_attributes work for wx_new [394], Greg Chicares, 2017/03/11