diff --git a/Fltk/Socket.cpp b/Fltk/Socket.cpp index b7bf182cef6c3c4300263ecac0139fee3116be1f..e376be785e603eabd536cfc1166ef3969b862050 100644 --- a/Fltk/Socket.cpp +++ b/Fltk/Socket.cpp @@ -1,4 +1,4 @@ -/* $Id: Socket.cpp,v 1.8 2001-05-07 07:25:04 geuzaine Exp $ */ +/* $Id: Socket.cpp,v 1.9 2001-05-07 07:35:40 geuzaine Exp $ */ #include <stdio.h> #include <stdlib.h> @@ -88,9 +88,7 @@ int Socket_StartProgram(char *progname, char *sockname){ #endif struct sockaddr_un addr, from; char command[1000]; -#ifndef _AIX fd_set rfds; -#endif struct timeval tv; int retval; @@ -126,13 +124,9 @@ int Socket_StartProgram(char *progname, char *sockname){ /* Wait up to 2 seconds */ tv.tv_sec = 2; tv.tv_usec = 0; -#ifdef _AIX - /* select not done */ -#else FD_ZERO(&rfds); FD_SET(s, &rfds); retval = select(s+1, &rfds, NULL, NULL, &tv); -#endif if(!retval){ Msg(GERROR, "Socket listening timeout"); diff --git a/Makefile b/Makefile index 12526e371bc0372d1666014f06c2d2343fdb6dc0..73ff5270e16119724b0f9e3ea970b2d63a345284 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.96 2001-05-04 13:45:08 geuzaine Exp $ +# $Id: Makefile,v 1.97 2001-05-07 07:35:40 geuzaine Exp $ # ---------------------------------------------------------------------- # Makefile for Gmsh # ---------------------------------------------------------------------- @@ -403,6 +403,16 @@ fltk_compile_big_endian: "GUI_INCLUDE=$(FLTK_INC)" \ ); done +fltk_compile_ibm: + @for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \ + "CC=$(CC)" \ + "C_FLAGS=-O3" \ + "OS_FLAGS=-D_BSD" \ + "VERSION_FLAGS=-D_FLTK -D_NODLL" \ + "GL_INCLUDE=$(OPENGL_INC)" \ + "GUI_INCLUDE=$(FLTK_INC)" \ + ); done + fltk_compile_solaris_scorec : @for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \ "CC=$(CC)" \ @@ -478,7 +488,7 @@ fltk_sun: tag fltk_compile_big_endian fltk_link_sun strip_bin compress_bin fltk_hp: tag fltk_compile_big_endian fltk_link_hp strip_bin compress_bin -fltk_ibm: tag fltk_compile_big_endian fltk_link_ibm strip_bin compress_bin +fltk_ibm: tag fltk_compile_ibm fltk_link_ibm strip_bin compress_bin fltk_solaris_scorec : tag fltk_compile_solaris_scorec fltk_link_solaris_scorec strip_bin