From 834167599b46611d4200ede5c70d621dcc8988cb Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 23 Feb 2001 08:46:12 +0000
Subject: [PATCH] Fix compile SGI
---
Graphics/Geom.cpp | 6 +-----
Makefile | 4 ++--
Mesh/SMS.cpp | 7 +++----
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index 7952f33ab3..c77aef75ae 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.16 2001-02-23 00:07:51 remacle Exp $
+// $Id: Geom.cpp,v 1.17 2001-02-23 08:46:12 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -833,7 +833,6 @@ void EndHighlight(int permanent){
void HighlightEntity(Vertex *v,Curve *c, Surface *s, int permanent){
Curve *cc;
- Vertex *v1,*v2;
char Message[256],temp[256];
int i,nbg;
@@ -845,9 +844,6 @@ void HighlightEntity(Vertex *v,Curve *c, Surface *s, int permanent){
else if(c){
if(permanent) c->ipar[3] = 1;
if(CTX.geom.highlight) Draw_Curve(&c,NULL);
-
- // List_Read(c->Control_Points,0,&v1);
- // List_Read(c->Control_Points,List_Nbr(c->Control_Points)-1,&v2);
Msg(STATUS1N,"Curve %d {%d->%d}",c->Num,c->beg->Num,c->end->Num);
}
else if(s){
diff --git a/Makefile b/Makefile
index 610dcb351c..5272bd2ee4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.68 2001-02-23 00:07:51 remacle Exp $
+# $Id: Makefile,v 1.69 2001-02-23 08:46:12 geuzaine Exp $
# ----------------------------------------------------------------------
# Makefile for Gmsh
# ----------------------------------------------------------------------
@@ -395,7 +395,7 @@ fltk_compile_linux_scorec :
fltk_compile_sgi:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
"CC=CC" \
- "C_FLAGS=-O2 -n32 -OPT:Olimit=0" \
+ "C_FLAGS=-O2 -n32 -OPT:Olimit=0 -LANG:std" \
"RANLIB=true"\
"AR=CC -n32 -ar -o"\
"OS_FLAGS=" \
diff --git a/Mesh/SMS.cpp b/Mesh/SMS.cpp
index 7d03988b1c..fe867f86c9 100644
--- a/Mesh/SMS.cpp
+++ b/Mesh/SMS.cpp
@@ -1,4 +1,4 @@
-#include <iostream>
+#include <iostream.h>
#include <assert.h>
#include "Gmsh.h"
#include "Geo.h"
@@ -38,9 +38,8 @@ void Read_VTK_File (char *file, Mesh *m)
FILE *in = fopen (file,"r");
if(!in)return;
char line[256],dumline1[256],dumline2[256];
- int i,j;
- int NbRegions,NbFaces,NbEdges,NbVertices,NbPoints,
- Vertex1,Vertex2,Vertex3,Vertex4,NbVerticesOnFace;
+ int i;
+ int NbFaces,NbVertices,Vertex1,Vertex2,Vertex3,NbVerticesOnFace;
double x,y,z;
Vertex *v1,*v2,*v3,*v4;
--
GitLab