From 87791ba5dea2415b419848a08b33828d32f73179 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 1 Mar 2006 16:07:17 +0000
Subject: [PATCH] fixed ubuntu compile

---
 Common/OS.cpp |  6 ++++--
 doc/FAQ       | 12 +++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Common/OS.cpp b/Common/OS.cpp
index ee416492a6..bc8cad14a0 100644
--- a/Common/OS.cpp
+++ b/Common/OS.cpp
@@ -1,4 +1,4 @@
-// $Id: OS.cpp,v 1.2 2006-02-26 16:55:08 geuzaine Exp $
+// $Id: OS.cpp,v 1.3 2006-03-01 16:07:17 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <signal.h>
 #include <time.h>
 
 #if !defined(WIN32) || defined(__CYGWIN__)
@@ -128,7 +129,8 @@ int StatFile(char *filename)
 int KillProcess(int pid)
 {
 #if !defined(WIN32) || defined(__CYGWIN__)
-  kill(pid, 9);
+  if(kill(pid, 9))
+    return 0;
 #else
   HANDLE hProc = OpenProcess(PROCESS_TERMINATE, FALSE, pid);
   if(!TerminateProcess(hProc, 0)){
diff --git a/doc/FAQ b/doc/FAQ
index 98afd94ab1..73acf79d89 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,4 +1,4 @@
-$Id: FAQ,v 1.71 2006-02-28 18:50:08 geuzaine Exp $
+$Id: FAQ,v 1.72 2006-03-01 16:07:17 geuzaine Exp $
 
 This is the Gmsh FAQ
 
@@ -327,10 +327,6 @@ The solver executable (for example, 'getdp.exe') has to be in your
 path. If not, simply go to the solver options (for example,
 'Solver->GetDP->Options->Executable') to specify its location.
 
-On recent versions of Microsoft Windows (XP SP2), it seems that you
-need to execute the solver (e.g. launch 'getdp.exe') at least once
-independently first in order to authorize future executions.
-
 * 6.3 Can I launch Gmsh from my solver (instead of launching my solver
 from Gmsh) in order to monitor a solution?
 
@@ -341,8 +337,10 @@ Sure. A simple C program showing how to do this is given in
 launched from Gmsh?
 
 Yes: just create a program as described in 6.1 above (you can skip the
-option file creation). Then run 'gmsh -listen' and Gmsh will listen
-for the program on the Solver.SocketName socket.
+option file creation). Then select 'Always listen to incoming
+connection requests' in the solver option panel (or run gmsh with the
+'-listen' command line option) and Gmsh will listen for the program on
+the Solver.SocketName socket.
 
 ********************************************************************
 
-- 
GitLab