[waffle] [PATCH 02/10] nacl: move dlfcn.h inclusion to where it's needed

Emil Velikov emil.l.velikov at gmail.com
Tue Mar 24 08:56:18 PDT 2015


Allows us to remove the extern "C" { #include <system_header.h> }
pattern which can cause subtle issues.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/waffle/nacl/nacl_container.cpp | 2 ++
 src/waffle/nacl/nacl_container.h   | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/waffle/nacl/nacl_container.cpp b/src/waffle/nacl/nacl_container.cpp
index 84ab1da..92b3823 100644
--- a/src/waffle/nacl/nacl_container.cpp
+++ b/src/waffle/nacl/nacl_container.cpp
@@ -23,6 +23,8 @@
 // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <dlfcn.h>
+
 #include "ppapi/cpp/graphics_3d.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
diff --git a/src/waffle/nacl/nacl_container.h b/src/waffle/nacl/nacl_container.h
index 579856d..a1371a7 100644
--- a/src/waffle/nacl/nacl_container.h
+++ b/src/waffle/nacl/nacl_container.h
@@ -25,8 +25,6 @@
 
 #ifdef __cplusplus
 
-#include <dlfcn.h>
-
 extern "C" {
 #endif
 
-- 
2.3.1



More information about the waffle mailing list