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

Patches from naka@hasaki.sumitomometals.co.jp
parent aa9bf5ee
No related branches found
No related tags found
No related merge requests found
/* $Id: GmshServer.cpp,v 1.10 2003-03-01 22:36:38 geuzaine Exp $ */ /* $Id: GmshServer.cpp,v 1.11 2003-03-05 23:15:04 geuzaine Exp $ */
/* /*
Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
...@@ -27,7 +27,7 @@ void SystemCall(char *str); ...@@ -27,7 +27,7 @@ void SystemCall(char *str);
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef _AIX #if defied(_AIX)
#include <strings.h> #include <strings.h>
#endif #endif
#include <sys/types.h> #include <sys/types.h>
...@@ -59,7 +59,7 @@ static int Socket_ReceiveData(int socket, void *buffer, int bytes) ...@@ -59,7 +59,7 @@ static int Socket_ReceiveData(int socket, void *buffer, int bytes)
static int Socket_UnlinkName(char *name) static int Socket_UnlinkName(char *name)
{ {
#ifdef _AIX #if defined(_AIX)
char name2[1000]; char name2[1000];
strcpy(name2, name); strcpy(name2, name);
name2[strlen(name2) - 1] = '\0'; name2[strlen(name2) - 1] = '\0';
...@@ -75,7 +75,7 @@ static int Socket_UnlinkName(char *name) ...@@ -75,7 +75,7 @@ static int Socket_UnlinkName(char *name)
int Gmsh_StartClient(char *command, char *sockname) int Gmsh_StartClient(char *command, char *sockname)
{ {
int s, sock; int s, sock;
#if defined(linux) || defined(_AIX) #if defined(linux) || defined(_AIX) || defined(__FreeBSD__)
socklen_t len; socklen_t len;
#else #else
int len; int len;
......
// $Id: Plugin.cpp,v 1.38 2003-03-02 01:18:33 geuzaine Exp $ // $Id: Plugin.cpp,v 1.39 2003-03-05 23:15:04 geuzaine Exp $
// //
// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
// //
...@@ -197,14 +197,14 @@ void GMSH_PluginManager::AddPlugin(char *dirName, char *pluginName) ...@@ -197,14 +197,14 @@ void GMSH_PluginManager::AddPlugin(char *dirName, char *pluginName)
sprintf(dynamic_lib, "%s/%s", dirName, pluginName); sprintf(dynamic_lib, "%s/%s", dirName, pluginName);
Msg(INFO, "Opening Plugin '%s'", dynamic_lib); Msg(INFO, "Opening Plugin '%s'", dynamic_lib);
void *hlib = dlopen(dynamic_lib, RTLD_NOW); void *hlib = dlopen(dynamic_lib, RTLD_NOW);
char *err = dlerror(); char *err = (char*)dlerror();
if(hlib == NULL) { if(hlib == NULL) {
Msg(WARNING, "Error in opening %s (dlerror = %s)", dynamic_lib, err); Msg(WARNING, "Error in opening %s (dlerror = %s)", dynamic_lib, err);
return; return;
} }
RegisterPlugin = RegisterPlugin =
(class GMSH_Plugin * (*)(void))dlsym(hlib, GMSH_PluginEntry); (class GMSH_Plugin * (*)(void))dlsym(hlib, GMSH_PluginEntry);
err = dlerror(); err = (char*)dlerror();
if(err != NULL) { if(err != NULL) {
Msg(WARNING, "Symbol '%s' missing in plugin '%s' (dlerror = %s)", Msg(WARNING, "Symbol '%s' missing in plugin '%s' (dlerror = %s)",
GMSH_PluginEntry, pluginName, err); GMSH_PluginEntry, pluginName, err);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment