Patch to allow compilation under Solaris 2.4 with gcc 2.6.3 *** /dev/null Fri Oct 27 20:33:10 1995 --- Makefile.solaris2 Fri Oct 27 20:35:30 1995 *************** *** 0 **** --- 1,75 ---- + # Makefile for Unix TECO 03/31/92 + # solaris 2.4/SPARC + # targets: + # te makes teco for a vt100 + # te_sun makes teco to run on a Sun keyboard with a VT100-emulator window + # te_sunw makes teco to run in a Sun window + # te_tool makes teco to run either in its own window (TECOtool) or in a Sun window + # tt makes TECOtool + CDF= -O -Dsolaris2 -DMCH + CC=gcc + LIBS= + + te: te_data.o te_utils.o te_subs.o te_main.o te_rdcmd.o te_exec0.o te_exec1.o te_exec2.o \ + te_srch.o te_chario.o te_window.o te_fxstub.o + $(CC) $(CDF) -o te te_data.o te_utils.o te_subs.o te_main.o te_rdcmd.o te_exec0.o te_exec1.o te_exec2.o \ + te_srch.o te_chario.o te_window.o te_fxstub.o $(LIBS) + + te_sun: te_data.o te_utils.o te_subs.o te_main.o te_rdcmd_sun.o te_exec0.o te_exec1.o \ + te_exec2.o te_srch.o te_chario_sun.o te_window.o te_fxstub.o + $(CC) -o te te_data.o te_utils.o te_subs.o te_main.o te_rdcmd_sun.o te_exec0.o te_exec1.o \ + te_exec2.o te_srch.o te_chario_sun.o te_window.o te_fxstub.o -ltermcap + + te_sunw: te_data.o te_utils.o te_subs.o te_main.o te_rdcmd_sun.o te_exec0.o te_exec1.o \ + te_exec2.o te_srch.o te_chario_sunw.o te_window_sun.o te_fxstub.o + $(CC) -o te te_data.o te_utils.o te_subs.o te_main.o te_rdcmd_sun.o te_exec0.o te_exec1.o \ + te_exec2.o te_srch.o te_chario_sunw.o te_window_sun.o te_fxstub.o -ltermcap + + te_tool: te_data.o te_utils.o te_subs.o te_main.o te_rdcmd_tt.o te_exec0.o te_exec1.o \ + te_exec2_tt.o te_srch.o te_chario_tt.o te_window_tt.o te_fxstub.o + $(CC) -o te te_data.o te_utils.o te_subs.o te_main.o te_rdcmd_tt.o te_exec0.o te_exec1.o \ + te_exec2_tt.o te_srch.o te_chario_tt.o te_window_tt.o te_fxstub.o -lsuntool -lsunwindow -lpixrect -ltermcap -ltermcap + + tt: tecotool.c teco.icon + $(CC) -o tt -I/usr/openwin/include -O tecotool.c -lsuntool -lsunwindow -lpixrect -ltermcap + + te_chario.o: te_defs.h te_chario.c + $(CC) -c $(CDF) te_chario.c + te_chario_sun.o: te_defs.h te_chario_sun.c + $(CC) -c $(CDF) te_chario_sun.c + te_chario_sunw.o: te_defs.h te_chario_sun.c + $(CC) -o te_chario_sunw.o -c $(CDF) -DSUNWINDOWS te_chario_sun.c + te_chario_tt.o: te_defs.h te_chario_sun.c + $(CC) -o te_chario_tt.o -c $(CDF) -DSUNWINDOWS -DTECOTOOL te_chario_sun.c + te_data.o: te_defs.h te_data.c + $(CC) -c $(CDF) te_data.c + te_exec0.o: te_defs.h te_exec0.c + $(CC) -c $(CDF) te_exec0.c + te_exec1.o: te_defs.h te_exec1.c + $(CC) -c $(CDF) te_exec1.c + te_exec2.o: te_defs.h te_exec2.c + $(CC) -c $(CDF) te_exec2.c + te_exec2_tt.o: te_defs.h te_exec2.c + $(CC) -o te_exec2_tt.o -c $(CDF) -DTECOTOOL te_exec2.c + te_fxstub.o: te_defs.h te_fxstub.c + $(CC) -c $(CDF) te_fxstub.c + te_main.o: te_defs.h te_main.c + $(CC) -c $(CDF) te_main.c + te_rdcmd.o: te_defs.h te_rdcmd.c + $(CC) -c $(CDF) te_rdcmd.c + te_rdcmd_sun.o: te_defs.h te_rdcmd_sun.c + $(CC) -c $(CDF) te_rdcmd_sun.c + te_rdcmd_tt.o: te_defs.h te_rdcmd_sun.c + $(CC) -o te_rdcmd_tt.o -c $(CDF) -DTECOTOOL te_rdcmd_sun.c + te_srch.o: te_defs.h te_srch.c + $(CC) -c $(CDF) te_srch.c + te_subs.o: te_defs.h te_subs.c + $(CC) -c $(CDF) te_subs.c + te_utils.o: te_defs.h te_utils.c + $(CC) -c $(CDF) te_utils.c + te_window.o: te_defs.h te_window.c + $(CC) -c $(CDF) te_window.c + te_window_sun.o: te_defs.h te_window_sun.c + $(CC) -c $(CDF) te_window_sun.c + te_window_tt.o: te_defs.h te_window_sun.c + $(CC) -o te_window_tt.o -c $(CDF) -DTECOTOOL te_window_sun.c *** te_chario.c.bak Fri Oct 27 20:33:53 1995 --- te_chario.c Fri Oct 27 20:38:17 1995 *************** *** 72,82 **** --- 72,92 ---- /* this is really for linux */ #define SA_INTERRUPT 0 #endif + #ifndef solaris2 struct sigaction intsigstruc = { int_handler, 0, SA_INTERRUPT } ; /* info structure for ^C interrupt */ struct sigaction stpsigstruc = { stp_handler, 0, SA_INTERRUPT } ; /* info structure for "stop" signal */ struct sigaction hupsigstruc = { hup_handler, 0, SA_INTERRUPT } ; /* info structure for "hangup" signal */ struct sigaction nosigstr = { SIG_DFL, 0, 0 }; /* default structure for signal */ struct sigaction sigwinchstruc = { winch_handler, 0, SA_INTERRUPT} ; + #else + /* Solaris 2.4 has weird ordering for signals in the sigaction - depending + upon this isn't very portable, so I should fix it */ + struct sigaction intsigstruc = { 0, int_handler, 0 } ; + struct sigaction stpsigstruc = { 0, stp_handler, 0}; + struct sigaction hupsigstruc = { 0, hup_handler, 0}; + struct sigaction nosigstr = { 0, SIG_DFL, 0}; + struct sigaction sigwinchstruc = { 0, winch_handler, 0}; + #endif #else struct sigvec intsigstruc = { int_handler, 0, 0 } ; /* info structure for ^C interrupt */ struct sigvec stpsigstruc = { stp_handler, 0, 0 } ; /* info structure for "stop" signal */ *** te_defs.h.bak Fri Oct 27 20:34:03 1995 --- te_defs.h Fri Oct 27 20:34:41 1995 *************** *** 82,87 **** --- 82,94 ---- #define POSIX_TECO #endif + #ifdef solaris2 + #define NO_VFORK + #define NO_TERMCAP + #define WAITRET_INT + #define POSIX_TECO + #endif + #ifdef sun /* we could use termcap, but I'd rather not */ #define NO_TERMCAP