? .DS_Store
? .gdb_history
? andres_patch
? bin
? careys_cmgui_mac.patch
? object
? uidh
? utilities
? source/.DS_Store
? source/date.h
? source/api/.DS_Store
? source/computed_field/computed_field_lookup.c
? source/computed_field/computed_field_lookup.h
? source/general/.DS_Store
? source/general/heapsort.c_archive
? source/general/heapsort.h_archive
Index: source/cmgui.Makefile
===================================================================
RCS file: /product/cmiss/cvs/cmgui/source/cmgui.Makefile,v
retrieving revision 1.94
diff -r1.94 cmgui.Makefile
42c42
<    ifeq ($(COMMONMAKEFILE_FOUND),)
---
>    ifeq ($(COMMONMAKEFILE_FOUND),)Ä
111a112,114
> ifeq ($(SYSNAME),Darwin)
>    TARGET_FILETYPE_SUFFIX =
> endif # SYSNAME == Darwin
166a170,173
> ifeq ($(SYSNAME),Darwin)
>    PLATFORM_DEFINES =  -DCMGUI 
>    OPERATING_SYSTEM_DEFINES = -DUNIX -DDARWIN
> endif # SYSNAME == Darwin
179c186
<       USER_INTERFACE_DEFINES = -DGTK_USER_INTERFACE
---
>       USER_INTERFACE_DEFINES = -DGTK_USER_INTERFACE 
205a213,215
>    ifeq ($(SYSNAME),Darwin)
>       GRAPHICS_LIBRARY_DEFINES += -DDM_BUFFERS
>    endif # SYSNAME == Darwin
220a231,233
> GRAPHICS_INC += -I$(CMISS_ROOT)/mesa/include/$(LIB_ARCH_DIR)
> GRAPHICS_LIB += $(patsubst %,-L%,$(firstword $(wildcard $(CMISS_ROOT)/mesa/lib/$(LIB_ARCH_DIR) )))
> 
360a374,376
> ifeq ($(SYSNAME),Darwin)
>    EXTERNAL_INPUT_DEFINES = -DSELECT_DESCRIPTORS
> endif # SYSNAME == Darwin
384a401,403
>    ifeq ($(SYSNAME),Darwin)
>       XML_DEFINES = -DLINUX -D_REENTRANT
>    endif # SYSNAME == Darwin
480a500,514
>    ifeq ($(SYSNAME),Darwin)
>       ifneq ($(wildcard $(CMISS_ROOT)/mesa/$(LIB_ARCH_DIR)/include),)
>          USER_INTERFACE_INC += -I$(CMISS_ROOT)/mesa/$(LIB_ARCH_DIR)/include
>       endif
>       USER_INTERFACE_INC += -I/usr/X11R6/include
>       X_LIB = /usr/X11R6/lib
>       USER_INTERFACE_LIB += -L$(X_LIB)
> 
>       ifneq ($(STATIC_LINK),true)
>          #I am statically linking Motif so that it does not have to be installed at runtime.
>          USER_INTERFACE_LIB += $(X_LIB)/libMrm.a $(X_LIB)/libXm.a -lXp -lXt -lX11 -lXmu -lXext
>       else # STATIC_LINK != true
>          USER_INTERFACE_LIB += -lMrm -lXm -lXp -lXt -lX11 -lXmu -lXext -lSM -lICE
>       endif # STATIC_LINK != true
>    endif # SYSNAME == Darwin
528a563,568
> ifeq ($(SYSNAME),Dawin)
>   ifneq (,$(wildcard /usr/lib/libscs.*))# have IRIX libscs
>     MATRIX_LIB = -lscs
>   endif# libscs
> endif# Darwin
> 
547a588,596
> ifeq ($(SYSNAME),Darwin)
>    ifneq ($(STATIC_LINK),true)
>       #For the dynamic link we really need to statically link the c++ as this
>       #seems to be particularly variable between distributions.
>       LIB = -lg2c -lm -ldl -lc -lpthread -lstdc++
>    else # $(STATIC_LINK) != true
>       LIB = -lg2c -lm -ldl -lpthread  -lstdc++
>    endif # $(STATIC_LINK) != true
> endif # SYSNAME == Darwin
563a613,615
> ifeq ($(SYSNAME),Darwin)
>    BOOST_INC = -I$(CMISS_ROOT)/boost-1.30.2
> endif # SYSNAME == Darwin
764d815
< 	general/error_handler.c \
766d816
< 	general/heapsort.c \
1300d1349
< 	general/heapsort.c \
Index: source/common.Makefile
===================================================================
RCS file: /product/cmiss/cvs/cmgui/source/common.Makefile,v
retrieving revision 1.37
diff -r1.37 common.Makefile
118a119,126
> ifeq ($(SYSNAME),Darwin)
>   ifndef STATIC
>     STATIC = true
>   endif
>   INSTRUCTION = ppc-32
>   OPERATING_SYSTEM = darwin
> endif
> 
333a342,392
> ifeq ($(SYSNAME),Darwin)
>    UIL = uil
> #    ifeq ($(MACHNAME),ia64)
> #       # Using Intel compilers
> #       CC = ecc -c
> #       CPP = $(CC)
> #       # turn on warnings,
> #       # suppress messages about non-standard fortran (including REAL*8,
> #       # more than 19 continuation lines),
> #       # suppress comment messages (including obsolescent alternate return),
> #       # auto arrays (as well as scalars), no aliasing,
> #       # no preprocessing, temporary arrays on stack if possible.
> #       FORTRAN = efc -c -W1 -w95 -cm -auto -fpp0 -stack_temps
> #    else
>       # gcc
>       CC = gcc -c
>       CPP = g++ -c
>       CPP_FLAGS =
>       FORTRAN = g77 -c -fno-second-underscore
> #    endif
>    MAKEDEPEND = gcc -MM -MG
>    CPREPROCESS = gcc -E -P
>    ifneq ($(STATIC_LINK),true)
>       LINK = gcc
>       # LINK = egcs -shared -L/usr/X11R6/lib -v */
>       # LINK = gcc -L/usr/X11R6/lib -v */
>    else # STATIC_LINK) != true
>       LINK = gcc -static
>       # LINK = g++ --no-demangle -rdynamic -L/usr/X11R6/lib*/
>    endif # STATIC_LINK) != true
>    ifneq ($(DEBUG),true)
>       OPTIMISATION_FLAGS = -O
>       COMPILE_DEFINES = -DOPTIMISED
>       COMPILE_FLAGS = -fPIC 
>       STRICT_FLAGS = -Werror
>       CPP_STRICT_FLAGS =  -Wno-long-double
>       DIGITAL_MEDIA_NON_STRICT_FLAGS = 
>       DIGITAL_MEDIA_NON_STRICT_FLAGS_PATTERN = NONE # Must specify a pattern that doesn't match
>    else  # DEBUG != true
>       OPTIMISATION_FLAGS = -g
>       COMPILE_DEFINES = -DREPORT_GL_ERRORS -DUSE_PARAMETER_ON
>       COMPILE_FLAGS = -fPIC
>       # A bug with gcc on esp56 stops -Wformat from working */
>       STRICT_FLAGS = -W -Wall -Wno-parentheses -Wno-switch -Wno-format -Werror
>       CPP_STRICT_FLAGS = -W -Wall -Wno-parentheses -Wno-switch -Wno-format -Werror
>       DIGITAL_MEDIA_NON_STRICT_FLAGS = 
>       DIGITAL_MEDIA_NON_STRICT_FLAGS_PATTERN = NONE # Must specify a pattern that doesn't match */
>       TARGET_TYPE_FLAGS =
>       TARGET_TYPE_DEFINES =
>    endif # DEBUG != true
> endif # SYSNAME == Darwin
Index: source/command/cmiss.c
===================================================================
RCS file: /product/cmiss/cvs/cmgui/source/command/cmiss.c,v
retrieving revision 1.253
diff -r1.253 cmiss.c
114c114
< #include "general/error_handler.h"
---
> /*#include "general/error_handler.h"*/
18070c18070
< #if defined (MOTIF)
---
> 
18138c18138
< #endif /* defined (MOTIF) */
---
> 
24615,24647d24614
< 		if ((!command_list) && (!write_help))
< 		{
< 			/* START_ERROR_HANDLING;*/
< 			switch (signal_code)
< 			{
< #if defined (MOTIF)
< 				/*???DB.  SIGBUS is not POSIX */
< 				case SIGBUS:
< 				{
< 					printf("Bus error occurred\n");
< 					display_message(ERROR_MESSAGE,"Bus error occurred");
< 				} break;
< #endif /* defined (MOTIF) */
< 				case SIGFPE:
< 				{
< 					printf("Floating point exception occurred\n");
< 					display_message(ERROR_MESSAGE,
< 						"Floating point exception occurred");
< 				} break;
< 				case SIGILL:
< 				{
< 					printf("Illegal instruction occurred\n");
< 					display_message(ERROR_MESSAGE,
< 						"Illegal instruction occurred");
< 				} break;
< 				case SIGSEGV:
< 				{
< 					printf("Invalid memory reference occurred\n");
< 					display_message(ERROR_MESSAGE,
< 						"Invalid memory reference occurred");
< 				} break;
< 			}
< 		}
Index: source/computed_field/computed_field_deformation.c
===================================================================
RCS file: /product/cmiss/cvs/cmgui/source/computed_field/computed_field_deformation.c,v
retrieving revision 1.8
diff -r1.8 computed_field_deformation.c
536c536
< 			COMPUTED_FIELD_ESTABLISH_METHODS(2d_strain);
---
> 			//COMPUTED_FIELD_ESTABLISH_METHODS(2d_strain);
Index: source/finite_element/finite_element.c
===================================================================
RCS file: /product/cmiss/cvs/cmgui/source/finite_element/finite_element.c,v
retrieving revision 1.118
diff -r1.118 finite_element.c
42c42,43
< #include "general/heapsort.h"
---
> /* CS 27/4/2004 conflicts with declaration in stdlib.h and probably isn't necessary - we don't use TurboC
> #include "general/heapsort.h" */
4925c4926
< static int sort_integers(void *number_1_address,void *number_2_address)
---
> static int sort_integers(const void *number_1_address,const void *number_2_address)
4957c4958
< static int sort_basis_functions(void *tuple_1_void,void *tuple_2_void)
---
> static int sort_basis_functions(const void *tuple_1_void,const void *tuple_2_void)
Index: source/general/myio.h
===================================================================
RCS file: /product/cmiss/cvs/cmgui/source/general/myio.h,v
retrieving revision 1.7
diff -r1.7 myio.h
29a30,32
> #if defined (DARWIN)
> #include <ppc/endian.h>
> #endif /* defined (DARWIN) */
Index: source/general/value.h
===================================================================
RCS file: /product/cmiss/cvs/cmgui/source/general/value.h,v
retrieving revision 1.7
diff -r1.7 value.h
20c20,22
< #include <values.h>
---
> /*#include <values.h>*/
> #include <limits.h>
> #include <float.h>
Index: source/utilities/uid2uidh.c
===================================================================
RCS file: /product/cmiss/cvs/cmgui/source/utilities/uid2uidh.c,v
retrieving revision 1.11
diff -r1.11 uid2uidh.c
31a32,34
> #if defined (DARWIN)
> #include <ppc/endian.h>
> #endif /* defined (DARWIN) */