From 08a4ef42ef54d579b95f38351e0d88aa61e9da52 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 5 Feb 2008 19:02:39 +0000
Subject: [PATCH] *** empty log message ***
---
Plugin/Makefile | 4 ++--
Plugin/Triangulate.cpp | 5 ++---
configure | 12 ++++++------
configure.in | 14 +++++++-------
4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 08a644c1e1..c265b5678d 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.147 2008-02-05 18:58:04 geuzaine Exp $
+# $Id: Makefile,v 1.148 2008-02-05 19:02:39 geuzaine Exp $
#
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
#
@@ -199,7 +199,7 @@ Triangulate.o: Triangulate.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Common/Options.h ../Post/ColorTable.h ../Post/PView.h \
../Post/PViewData.h ../Post/PViewOptions.h ../Post/ColorTable.h \
../Post/PViewDataList.h ../Post/PViewData.h ../Post/AdaptiveViews.h \
- ../Common/GmshMatrix.h ../DataStr/Malloc.h ../Common/Context.h
+ ../Common/GmshMatrix.h ../Common/Context.h
Warp.o: Warp.cpp Warp.h Plugin.h ../Common/Options.h ../Post/ColorTable.h \
../Common/Message.h ../Post/PView.h ../Post/PViewData.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Post/PViewOptions.h \
diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp
index 769d926c9d..46591c2d29 100644
--- a/Plugin/Triangulate.cpp
+++ b/Plugin/Triangulate.cpp
@@ -1,4 +1,4 @@
-// $Id: Triangulate.cpp,v 1.41 2008-02-05 18:58:04 geuzaine Exp $
+// $Id: Triangulate.cpp,v 1.42 2008-02-05 19:02:39 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -26,7 +26,6 @@
#include "Message.h"
#include "MVertex.h"
#include "Triangulate.h"
-#include "Malloc.h"
#include "Context.h"
extern Context_T CTX;
@@ -119,7 +118,7 @@ static void Triangulate(int nbIn, List_T *inList, int *nbOut, List_T *outList,
// build a point record structure for the divide and conquer
DocRecord doc;
- doc.points = (PointRecord*)malloc(points.size() * sizeof(PointRecord));
+ doc.points = (PointRecord*)malloc(points.size() * sizeof(PointRecord));
for (unsigned int i = 0; i < points.size(); i++){
double XX = CTX.mesh.rand_factor * lc * (double)rand() / (double)RAND_MAX;
double YY = CTX.mesh.rand_factor * lc * (double)rand() / (double)RAND_MAX;
diff --git a/configure b/configure
index f6c376279b..f4eb281fc5 100755
--- a/configure
+++ b/configure
@@ -3629,9 +3629,9 @@ GMSH_DIRS="Common DataStr Geo Mesh Post Numeric Parallel Parser Plugin"
if test "x$enable_gui" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
- GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo"
- GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr -lGmshNumeric"
- GMSH_LIBS="${GMSH_LIBS} -lGmshParallel"
+ GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshPlugin"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshMesh -lGmshGeo -lGmshPost -lGmshCommon"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel"
FLAGS="-DHAVE_FLTK ${FLAGS}"
if test "x${FLTK_PREFIX}" != "x" ; then
@@ -4089,9 +4089,9 @@ fi
else
GMSH_DIRS="${GMSH_DIRS} Box"
- GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo"
- GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr"
- GMSH_LIBS="${GMSH_LIBS} -lGmshNumeric -lGmshParallel"
+ GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshPlugin"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshMesh -lGmshGeo -lGmshPost -lGmshCommon"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel"
ZLIB=""
if test "x$enable_zlib" != "xno"; then
diff --git a/configure.in b/configure.in
index 0df2b92f30..ef7a663d2c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.148 2008-02-05 18:58:04 geuzaine Exp $
+dnl $Id: configure.in,v 1.149 2008-02-05 19:00:19 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
dnl
@@ -206,9 +206,9 @@ dnl Choose blackbox or GUI version
if test "x$enable_gui" != "xno"; then
GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
- GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo"
- GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr -lGmshNumeric"
- GMSH_LIBS="${GMSH_LIBS} -lGmshParallel"
+ GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshPlugin"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshMesh -lGmshGeo -lGmshPost -lGmshCommon"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel"
FLAGS="-DHAVE_FLTK ${FLAGS}"
if test "x${FLTK_PREFIX}" != "x" ; then
@@ -334,9 +334,9 @@ if test "x$enable_gui" != "xno"; then
else
GMSH_DIRS="${GMSH_DIRS} Box"
- GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshMesh -lGmshGeo"
- GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr"
- GMSH_LIBS="${GMSH_LIBS} -lGmshNumeric -lGmshParallel"
+ GMSH_LIBS="-Llib Box/Main.o -lGmshBox -lGmshParser -lGmshPlugin"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshMesh -lGmshGeo -lGmshPost -lGmshCommon"
+ GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel"
dnl Check for libz
ZLIB=""
--
GitLab