From aee8ebe1c496a3e956078dd18b6e19e05a46e558 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 14 Mar 2005 06:32:33 +0000
Subject: [PATCH] trying to fix compile with old g++ 2.95
---
Fltk/GmshServer.h | 6 +++---
Fltk/Solvers.cpp | 6 +++++-
configure | 1 +
configure.in | 3 ++-
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Fltk/GmshServer.h b/Fltk/GmshServer.h
index 01311f4d93..014d17cbea 100644
--- a/Fltk/GmshServer.h
+++ b/Fltk/GmshServer.h
@@ -61,6 +61,9 @@ class GmshServer {
CLIENT_OPTION_3 = 102,
CLIENT_OPTION_4 = 103,
CLIENT_OPTION_5 = 104 } MessageType;
+ // FIXME: this should be removed
+ static int init, s;
+
private:
int _maxdelay, _portno, _sock;
char *_sockname;
@@ -84,9 +87,6 @@ class GmshServer {
~GmshServer(){}
int StartClient(char *command, char *sockname = NULL)
{
- static int init = 0;
- static int s;
-
_sockname = sockname;
// no socket? launch the command directly
diff --git a/Fltk/Solvers.cpp b/Fltk/Solvers.cpp
index 652b1421d9..e8c2462871 100644
--- a/Fltk/Solvers.cpp
+++ b/Fltk/Solvers.cpp
@@ -1,4 +1,4 @@
-// $Id: Solvers.cpp,v 1.35 2005-01-16 20:41:38 geuzaine Exp $
+// $Id: Solvers.cpp,v 1.36 2005-03-14 06:32:33 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -22,6 +22,10 @@
#include "Gmsh.h"
#include "GmshServer.h"
+// FIXME: this should be removed
+int GmshServer::init = 0;
+int GmshServer::s;
+
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
diff --git a/configure b/configure
index 377d3d8eef..0f1961d8f6 100755
--- a/configure
+++ b/configure
@@ -3872,6 +3872,7 @@ case "$UNAME" in
;;
OSF1*)
+ FLAGS="-DHAVE_NO_SOCKLEN_T ${FLAGS}"
if test "x${CXX}" = "xcxx" ; then
FLAGS="-D__USE_STD_IOSTREAM ${FLAGS}"
fi
diff --git a/configure.in b/configure.in
index 65c15c8410..bb2f1f8b2d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.60 2005-01-21 17:29:27 geuzaine Exp $
+dnl $Id: configure.in,v 1.61 2005-03-14 06:32:33 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
dnl
@@ -382,6 +382,7 @@ case "$UNAME" in
;;
OSF1*)
+ FLAGS="-DHAVE_NO_SOCKLEN_T ${FLAGS}"
if test "x${CXX}" = "xcxx" ; then
FLAGS="-D__USE_STD_IOSTREAM ${FLAGS}"
fi
--
GitLab