From cae075c2b3b5e21a7e614635228de29ab484a153 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 19 Dec 2011 12:11:58 +0000
Subject: [PATCH] and one more

---
 Common/ListUtils.cpp      | 4 +---
 Common/avl.cpp            | 4 +---
 Fltk/FlGui.cpp            | 4 +---
 Fltk/menuWindow.cpp       | 4 +---
 Fltk/optionWindow.cpp     | 6 ++++--
 Fltk/pluginWindow.cpp     | 4 +---
 Fltk/visibilityWindow.cpp | 4 +---
 7 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Common/ListUtils.cpp b/Common/ListUtils.cpp
index beb8ecaf1b..3d9ffbc04b 100644
--- a/Common/ListUtils.cpp
+++ b/Common/ListUtils.cpp
@@ -9,9 +9,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/Common/avl.cpp b/Common/avl.cpp
index 3bccf2cbdf..11381b9d47 100644
--- a/Common/avl.cpp
+++ b/Common/avl.cpp
@@ -27,9 +27,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <stdio.h>
 #include "avl.h"
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index ea0dff1db5..e7493e1970 100644
--- a/Fltk/FlGui.cpp
+++ b/Fltk/FlGui.cpp
@@ -5,9 +5,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <sstream>
 #include <string.h>
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index caac5e5faa..75cdbc46df 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -5,9 +5,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <string.h>
 #include <stdlib.h>
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index cee1eecff2..b8782983af 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -3,12 +3,14 @@
 // See the LICENSE.txt file for license information. Please report all
 // bugs and problems to <gmsh@geuz.org>.
 
+#include "GmshConfig.h"
+#if defined(HAVE_NO_INTPTR_T)
+typedef unsigned long intptr_t;
+#endif
 #include <string.h>
-#include <stdint.h>
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Scroll.H>
 #include <FL/Fl_Color_Chooser.H>
-#include "GmshConfig.h"
 #include "GmshDefines.h"
 #include "GmshMessage.h"
 #include "FlGui.h"
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index aa9296775b..5b79ec4362 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -5,9 +5,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <vector>
 #include <string.h>
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 069cfdd071..e3b1f74cb7 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -5,9 +5,7 @@
 
 #include "GmshConfig.h"
 #if defined(HAVE_NO_INTPTR_T)
-typedef unsigned intptr_t;
-#else
-#include <stdint.h>
+typedef unsigned long intptr_t;
 #endif
 #include <string>
 #include <sstream>
-- 
GitLab