From 133a88a2b27b44f1ff6fbd535e87ec7d13e3b908 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 19 Dec 2011 16:14:35 +0000
Subject: [PATCH] one more try to fix intptr_t madness :-)

---
 Common/ListUtils.cpp      | 3 +--
 Common/avl.cpp            | 3 +--
 Fltk/FlGui.cpp            | 3 +--
 Fltk/menuWindow.cpp       | 3 +--
 Fltk/optionWindow.cpp     | 3 +--
 Fltk/pluginWindow.cpp     | 3 +--
 Fltk/visibilityWindow.cpp | 3 +--
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Common/ListUtils.cpp b/Common/ListUtils.cpp
index de517a4f7a..19f1285e03 100644
--- a/Common/ListUtils.cpp
+++ b/Common/ListUtils.cpp
@@ -10,8 +10,7 @@
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
 #include <stdint.h>
-#endif
-#if defined(HAVE_NO_INTPTR_T)
+#elif defined(HAVE_NO_INTPTR_T)
 typedef unsigned long intptr_t;
 #endif
 #include <stdlib.h>
diff --git a/Common/avl.cpp b/Common/avl.cpp
index 7054665ce9..d50deb428a 100644
--- a/Common/avl.cpp
+++ b/Common/avl.cpp
@@ -28,8 +28,7 @@
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
 #include <stdint.h>
-#endif
-#if defined(HAVE_NO_INTPTR_T)
+#elif defined(HAVE_NO_INTPTR_T)
 typedef unsigned long intptr_t;
 #endif
 #include <stdio.h>
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index bf0f9b7c0e..240ff5039f 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -6,8 +6,7 @@
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
 #include <stdint.h>
-#endif
-#if defined(HAVE_NO_INTPTR_T)
+#elif defined(HAVE_NO_INTPTR_T)
 typedef unsigned long intptr_t;
 #endif
 #include <sstream>
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index 2c3fc1f11a..6a49a73efc 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -6,8 +6,7 @@
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
 #include <stdint.h>
-#endif
-#if defined(HAVE_NO_INTPTR_T)
+#elif defined(HAVE_NO_INTPTR_T)
 typedef unsigned long intptr_t;
 #endif
 #include <string.h>
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 873a67e704..c83bebc655 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -6,8 +6,7 @@
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
 #include <stdint.h>
-#endif
-#if defined(HAVE_NO_INTPTR_T)
+#elif defined(HAVE_NO_INTPTR_T)
 typedef unsigned long intptr_t;
 #endif
 #include <string.h>
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 94e4cdffa9..cf9bc0352b 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -6,8 +6,7 @@
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
 #include <stdint.h>
-#endif
-#if defined(HAVE_NO_INTPTR_T)
+#elif defined(HAVE_NO_INTPTR_T)
 typedef unsigned long intptr_t;
 #endif
 #include <vector>
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 163d62bb7b..a447d815e1 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -6,8 +6,7 @@
 #include "GmshConfig.h"
 #if !defined(HAVE_NO_STDINT_H)
 #include <stdint.h>
-#endif
-#if defined(HAVE_NO_INTPTR_T)
+#elif defined(HAVE_NO_INTPTR_T)
 typedef unsigned long intptr_t;
 #endif
 #include <string>
-- 
GitLab