Skip to content
Snippets Groups Projects
Commit aee8ebe1 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

trying to fix compile with old g++ 2.95
parent dc79ebd7
No related branches found
No related tags found
No related merge requests found
...@@ -61,6 +61,9 @@ class GmshServer { ...@@ -61,6 +61,9 @@ class GmshServer {
CLIENT_OPTION_3 = 102, CLIENT_OPTION_3 = 102,
CLIENT_OPTION_4 = 103, CLIENT_OPTION_4 = 103,
CLIENT_OPTION_5 = 104 } MessageType; CLIENT_OPTION_5 = 104 } MessageType;
// FIXME: this should be removed
static int init, s;
private: private:
int _maxdelay, _portno, _sock; int _maxdelay, _portno, _sock;
char *_sockname; char *_sockname;
...@@ -84,9 +87,6 @@ class GmshServer { ...@@ -84,9 +87,6 @@ class GmshServer {
~GmshServer(){} ~GmshServer(){}
int StartClient(char *command, char *sockname = NULL) int StartClient(char *command, char *sockname = NULL)
{ {
static int init = 0;
static int s;
_sockname = sockname; _sockname = sockname;
// no socket? launch the command directly // no socket? launch the command directly
......
// $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 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
// //
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshServer.h" #include "GmshServer.h"
// FIXME: this should be removed
int GmshServer::init = 0;
int GmshServer::s;
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
......
...@@ -3872,6 +3872,7 @@ case "$UNAME" in ...@@ -3872,6 +3872,7 @@ case "$UNAME" in
;; ;;
OSF1*) OSF1*)
FLAGS="-DHAVE_NO_SOCKLEN_T ${FLAGS}"
if test "x${CXX}" = "xcxx" ; then if test "x${CXX}" = "xcxx" ; then
FLAGS="-D__USE_STD_IOSTREAM ${FLAGS}" FLAGS="-D__USE_STD_IOSTREAM ${FLAGS}"
fi fi
......
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
dnl Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle dnl Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
dnl dnl
...@@ -382,6 +382,7 @@ case "$UNAME" in ...@@ -382,6 +382,7 @@ case "$UNAME" in
;; ;;
OSF1*) OSF1*)
FLAGS="-DHAVE_NO_SOCKLEN_T ${FLAGS}"
if test "x${CXX}" = "xcxx" ; then if test "x${CXX}" = "xcxx" ; then
FLAGS="-D__USE_STD_IOSTREAM ${FLAGS}" FLAGS="-D__USE_STD_IOSTREAM ${FLAGS}"
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment