diff --git a/Cassiopee/CPlot/CPlot/Data.h b/Cassiopee/CPlot/CPlot/Data.h
index 8645ef0b4..8dea49867 100644
--- a/Cassiopee/CPlot/CPlot/Data.h
+++ b/Cassiopee/CPlot/CPlot/Data.h
@@ -47,7 +47,11 @@
 
 #ifdef __MESA__
 #define GLAPI extern
-//#define APIENTRY // added for ubuntu, to be checked on other linux
+#ifdef _WIN32
+  #define APIENTRY __stdcall
+#else
+  #define APIENTRY
+#endif
 #include <GL/osmesa.h>
 #endif
 
diff --git a/Cassiopee/CPlot/CPlot/GLEW/glew.c b/Cassiopee/CPlot/CPlot/GLEW/glew.c
index ed8032bb7..42cf494d8 100644
--- a/Cassiopee/CPlot/CPlot/GLEW/glew.c
+++ b/Cassiopee/CPlot/CPlot/GLEW/glew.c
@@ -38,7 +38,11 @@
 
 #if defined(GLEW_OSMESA)
 #  define GLAPI extern
-//#  define APIENTRY // added for ubuntu, to be checked on other linux
+#  ifdef _WIN32
+#    define APIENTRY __stdcall
+#  else
+#    define APIENTRY
+#  endif
 #  include <GL/osmesa.h>
 #elif defined(GLEW_EGL)
 #  include <GL/eglew.h>