diff options
Diffstat (limited to 'src')
109 files changed, 36 insertions, 110 deletions
diff --git a/src/clef/edible.c b/src/clef/edible.cc index c3022060..c3022060 100644 --- a/src/clef/edible.c +++ b/src/clef/edible.cc diff --git a/src/etc/asq.c.pamphlet b/src/etc/asq.c.pamphlet index 0ef9c5ef..98217cae 100644 --- a/src/etc/asq.c.pamphlet +++ b/src/etc/asq.c.pamphlet @@ -524,7 +524,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* printhelp -- print the help info */ /* main */ -#include "openaxiom-c-macros.h" #include <ctype.h> #include <unistd.h> diff --git a/src/graph/Gdraws/Gdraws0.h b/src/graph/Gdraws/Gdraws0.h index 632c3704..88425df1 100644 --- a/src/graph/Gdraws/Gdraws0.h +++ b/src/graph/Gdraws/Gdraws0.h @@ -36,7 +36,6 @@ #ifndef _GDRAWS0_H_ #define _GDRAWS0_H_ 1 -#include "openaxiom-c-macros.h" #include <X11/Xlib.h> diff --git a/src/graph/view2D/buttons2d.c b/src/graph/view2D/buttons2d.c index 1babc196..1f435657 100644 --- a/src/graph/view2D/buttons2d.c +++ b/src/graph/view2D/buttons2d.c @@ -34,7 +34,6 @@ */ #define _BUTTONS2D_C -#include "openaxiom-c-macros.h" #include <string.h> diff --git a/src/graph/view2D/control2d.c b/src/graph/view2D/control2d.c index 051184c4..83be366c 100644 --- a/src/graph/view2D/control2d.c +++ b/src/graph/view2D/control2d.c @@ -34,7 +34,6 @@ */ #define _CONTROL2D_C -#include "openaxiom-c-macros.h" #include <stdlib.h> #include <unistd.h> diff --git a/src/graph/view2D/graph2d.c b/src/graph/view2D/graph2d.c index dadd4008..2e1f9f86 100644 --- a/src/graph/view2D/graph2d.c +++ b/src/graph/view2D/graph2d.c @@ -34,7 +34,6 @@ */ #define _GRAPH2D_C -#include "openaxiom-c-macros.h" #include <stdio.h> #include <unistd.h> diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c index 29c3b3d7..ac8547ee 100644 --- a/src/graph/view2D/main2d.c +++ b/src/graph/view2D/main2d.c @@ -34,7 +34,6 @@ */ #define _MAIN2D_C -#include "openaxiom-c-macros.h" #include <string.h> #include <stdlib.h> diff --git a/src/graph/view2D/pot2d.c b/src/graph/view2D/pot2d.c index 19f34e96..69aa985a 100644 --- a/src/graph/view2D/pot2d.c +++ b/src/graph/view2D/pot2d.c @@ -34,7 +34,6 @@ */ #define _POT2D_C -#include "openaxiom-c-macros.h" #include "header2.h" diff --git a/src/graph/view2D/process2d.c b/src/graph/view2D/process2d.c index 52c326f6..96740d35 100644 --- a/src/graph/view2D/process2d.c +++ b/src/graph/view2D/process2d.c @@ -34,7 +34,6 @@ */ #define _PROCESS2D_C -#include "openaxiom-c-macros.h" #include <string.h> #include <stdio.h> diff --git a/src/graph/view2D/spadAction2d.c b/src/graph/view2D/spadAction2d.c index 60789eb1..bceec18d 100644 --- a/src/graph/view2D/spadAction2d.c +++ b/src/graph/view2D/spadAction2d.c @@ -34,7 +34,6 @@ */ #define _SPADACTION2D_C -#include "openaxiom-c-macros.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/graph/view2D/stuff2d.c b/src/graph/view2D/stuff2d.c index 1674d2f2..49649fdb 100644 --- a/src/graph/view2D/stuff2d.c +++ b/src/graph/view2D/stuff2d.c @@ -34,7 +34,6 @@ */ #define _STUFF2D_C -#include "openaxiom-c-macros.h" #include <unistd.h> #include <stdlib.h> diff --git a/src/graph/view2D/write2d.c b/src/graph/view2D/write2d.c index 395b821a..967dd149 100644 --- a/src/graph/view2D/write2d.c +++ b/src/graph/view2D/write2d.c @@ -34,7 +34,6 @@ */ #define _WRITE2D_C -#include "openaxiom-c-macros.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/graph/view3D/buttons3d.c b/src/graph/view3D/buttons3d.c index d96031b9..1b3c4bcb 100644 --- a/src/graph/view3D/buttons3d.c +++ b/src/graph/view3D/buttons3d.c @@ -34,7 +34,6 @@ */ #define _BUTTONS3D_C -#include "openaxiom-c-macros.h" #include "header.h" #include "cpanel.h" diff --git a/src/graph/view3D/closeView3d.c b/src/graph/view3D/closeView3d.c index 14c64110..af040411 100644 --- a/src/graph/view3D/closeView3d.c +++ b/src/graph/view3D/closeView3d.c @@ -34,7 +34,6 @@ */ #define _CLOSEVIEW3D_C -#include "openaxiom-c-macros.h" #include <stdlib.h> #include "header.h" diff --git a/src/graph/view3D/component3d.c b/src/graph/view3D/component3d.c index 626790be..e45c58cf 100644 --- a/src/graph/view3D/component3d.c +++ b/src/graph/view3D/component3d.c @@ -34,7 +34,6 @@ */ #define _COMPONENT3D_C -#include "openaxiom-c-macros.h" #include "header.h" #include "draw.h" diff --git a/src/graph/view3D/control3d.c b/src/graph/view3D/control3d.c index 2fb407e6..0e59aec5 100644 --- a/src/graph/view3D/control3d.c +++ b/src/graph/view3D/control3d.c @@ -34,7 +34,6 @@ */ #define _CONTROL3D_C -#include "openaxiom-c-macros.h" #include <string.h> #include <stdio.h> diff --git a/src/graph/view3D/illuminate3d.c b/src/graph/view3D/illuminate3d.c index 323e5916..78bec762 100644 --- a/src/graph/view3D/illuminate3d.c +++ b/src/graph/view3D/illuminate3d.c @@ -34,7 +34,6 @@ */ #define _ILLUMINATE3D_C -#include "openaxiom-c-macros.h" #include <math.h> diff --git a/src/graph/view3D/lightbut3d.c b/src/graph/view3D/lightbut3d.c index b15b14da..42eb140b 100644 --- a/src/graph/view3D/lightbut3d.c +++ b/src/graph/view3D/lightbut3d.c @@ -34,7 +34,6 @@ */ #define _LIGHTBUT3D_C -#include "openaxiom-c-macros.h" #include "header.h" #include "cpanel.h" diff --git a/src/graph/view3D/lighting3d.c b/src/graph/view3D/lighting3d.c index 5d0b5489..03438aaa 100644 --- a/src/graph/view3D/lighting3d.c +++ b/src/graph/view3D/lighting3d.c @@ -34,7 +34,6 @@ */ #define _LIGHTING3D_C -#include "openaxiom-c-macros.h" #include <math.h> #include <string.h> diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c index 90616192..a987028f 100644 --- a/src/graph/view3D/main3d.c +++ b/src/graph/view3D/main3d.c @@ -34,7 +34,6 @@ */ #define _MAIN3D_C -#include "openaxiom-c-macros.h" #include <string.h> #include <stdio.h> diff --git a/src/graph/view3D/mesh3d.c b/src/graph/view3D/mesh3d.c index 716cebeb..c1369e3f 100644 --- a/src/graph/view3D/mesh3d.c +++ b/src/graph/view3D/mesh3d.c @@ -34,7 +34,6 @@ */ #define _MESH3D_C -#include "openaxiom-c-macros.h" #include <math.h> diff --git a/src/graph/view3D/msort3d.c b/src/graph/view3D/msort3d.c index f034fe2d..36d2ca43 100644 --- a/src/graph/view3D/msort3d.c +++ b/src/graph/view3D/msort3d.c @@ -34,7 +34,6 @@ */ #define _MSORT3D_C -#include "openaxiom-c-macros.h" /***************************************************** diff --git a/src/graph/view3D/pot3d.c b/src/graph/view3D/pot3d.c index 0e519313..a38b16e9 100644 --- a/src/graph/view3D/pot3d.c +++ b/src/graph/view3D/pot3d.c @@ -34,7 +34,6 @@ */ #define _POT3D_C -#include "openaxiom-c-macros.h" #include "header.h" #include "all_3d.H1" diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c index f5adbf9e..fcceb2e4 100644 --- a/src/graph/view3D/process3d.c +++ b/src/graph/view3D/process3d.c @@ -34,7 +34,6 @@ */ #define _PROCESS3D_C -#include "openaxiom-c-macros.h" #include <string.h> #include <stdlib.h> diff --git a/src/graph/view3D/project3d.c b/src/graph/view3D/project3d.c index f95d12d5..0032953d 100644 --- a/src/graph/view3D/project3d.c +++ b/src/graph/view3D/project3d.c @@ -34,7 +34,6 @@ */ #define _PROJECT3D_C -#include "openaxiom-c-macros.h" #include <string.h> #include "header.h" diff --git a/src/graph/view3D/quit3d.c b/src/graph/view3D/quit3d.c index bcbcd707..3218e00e 100644 --- a/src/graph/view3D/quit3d.c +++ b/src/graph/view3D/quit3d.c @@ -34,7 +34,6 @@ */ #define _QUIT3D_C -#include "openaxiom-c-macros.h" #include <string.h> #include "header.h" diff --git a/src/graph/view3D/quitbut3d.c b/src/graph/view3D/quitbut3d.c index 448d80ed..a4ada8f4 100644 --- a/src/graph/view3D/quitbut3d.c +++ b/src/graph/view3D/quitbut3d.c @@ -34,7 +34,6 @@ */ #define _QUITBUT3D_C -#include "openaxiom-c-macros.h" #include "header.h" #include "cpanel.h" diff --git a/src/graph/view3D/save3d.c b/src/graph/view3D/save3d.c index be86090f..2114668a 100644 --- a/src/graph/view3D/save3d.c +++ b/src/graph/view3D/save3d.c @@ -34,7 +34,6 @@ */ #define _SAVE3D_C -#include "openaxiom-c-macros.h" #include <stdio.h> #include <string.h> diff --git a/src/graph/view3D/savebut3d.c b/src/graph/view3D/savebut3d.c index d6e1e900..f2b80a8d 100644 --- a/src/graph/view3D/savebut3d.c +++ b/src/graph/view3D/savebut3d.c @@ -34,7 +34,6 @@ */ #define _SAVEBUT3D_C -#include "openaxiom-c-macros.h" #include "header.h" #include "cpanel.h" diff --git a/src/graph/view3D/smoothShade3d.c b/src/graph/view3D/smoothShade3d.c index b794f210..bb6a97bd 100644 --- a/src/graph/view3D/smoothShade3d.c +++ b/src/graph/view3D/smoothShade3d.c @@ -34,7 +34,6 @@ */ #define _SMOOTHSHADE_C -#include "openaxiom-c-macros.h" #include <string.h> #include <math.h> diff --git a/src/graph/view3D/spadAction3d.c b/src/graph/view3D/spadAction3d.c index 0c3861f3..e9ce3827 100644 --- a/src/graph/view3D/spadAction3d.c +++ b/src/graph/view3D/spadAction3d.c @@ -34,7 +34,6 @@ */ #define _SPADACTION3D_C -#include "openaxiom-c-macros.h" #include <unistd.h> #include <stdio.h> diff --git a/src/graph/view3D/stuff3d.c b/src/graph/view3D/stuff3d.c index ed466eb3..2362fc74 100644 --- a/src/graph/view3D/stuff3d.c +++ b/src/graph/view3D/stuff3d.c @@ -34,7 +34,6 @@ */ #define _STUFF3D_C -#include "openaxiom-c-macros.h" #include "header.h" diff --git a/src/graph/view3D/surface3d.c b/src/graph/view3D/surface3d.c index 3cff2df6..27647d23 100644 --- a/src/graph/view3D/surface3d.c +++ b/src/graph/view3D/surface3d.c @@ -34,7 +34,6 @@ */ #define _SURFACE3D_C -#include "openaxiom-c-macros.h" #include <string.h> #include <math.h> diff --git a/src/graph/view3D/testcol.c b/src/graph/view3D/testcol.c index 9eaea909..2c576bd6 100644 --- a/src/graph/view3D/testcol.c +++ b/src/graph/view3D/testcol.c @@ -34,7 +34,6 @@ */ #define _MAIN3D_C -#include "openaxiom-c-macros.h" #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/graph/view3D/transform3d.c b/src/graph/view3D/transform3d.c index 4030e25c..c4390f99 100644 --- a/src/graph/view3D/transform3d.c +++ b/src/graph/view3D/transform3d.c @@ -34,7 +34,6 @@ */ #define _TRANSFORM3D_C -#include "openaxiom-c-macros.h" #include "header.h" diff --git a/src/graph/view3D/viewport3d.c b/src/graph/view3D/viewport3d.c index eed96b72..b0d9cb40 100644 --- a/src/graph/view3D/viewport3d.c +++ b/src/graph/view3D/viewport3d.c @@ -34,7 +34,6 @@ */ #define _VIEWPORT3D_C -#include "openaxiom-c-macros.h" #include <math.h> #include <stdio.h> diff --git a/src/graph/view3D/volume3d.c b/src/graph/view3D/volume3d.c index 87bce529..1794a1d2 100644 --- a/src/graph/view3D/volume3d.c +++ b/src/graph/view3D/volume3d.c @@ -34,7 +34,6 @@ */ #define _VOLUME3D_C -#include "openaxiom-c-macros.h" #include <math.h> #include <string.h> diff --git a/src/graph/view3D/write3d.c b/src/graph/view3D/write3d.c index 7eeaf15b..dd3c9a15 100644 --- a/src/graph/view3D/write3d.c +++ b/src/graph/view3D/write3d.c @@ -34,7 +34,6 @@ */ #define _WRITE3D_C -#include "openaxiom-c-macros.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/graph/viewAlone/viewAlone.c b/src/graph/viewAlone/viewAlone.c index 07f89039..5fb48a93 100644 --- a/src/graph/viewAlone/viewAlone.c +++ b/src/graph/viewAlone/viewAlone.c @@ -34,7 +34,6 @@ */ #define _VIEWALONE_C -#include "openaxiom-c-macros.h" #include <stdlib.h> #include "viewAlone.h" diff --git a/src/graph/viewman/cleanup.c b/src/graph/viewman/cleanup.c index 4dfbc04e..20c4cfa9 100644 --- a/src/graph/viewman/cleanup.c +++ b/src/graph/viewman/cleanup.c @@ -34,7 +34,6 @@ */ #define _CLEANUP_C -#include "openaxiom-c-macros.h" #include <stdlib.h> #include <unistd.h> diff --git a/src/graph/viewman/make2D.c b/src/graph/viewman/make2D.c index 65810003..0cbcf8bc 100644 --- a/src/graph/viewman/make2D.c +++ b/src/graph/viewman/make2D.c @@ -34,7 +34,6 @@ */ #define _MAKE2D_C -#include "openaxiom-c-macros.h" #include "viewman.h" diff --git a/src/graph/viewman/make3D.c b/src/graph/viewman/make3D.c index 30f2e869..2bbaebb9 100644 --- a/src/graph/viewman/make3D.c +++ b/src/graph/viewman/make3D.c @@ -34,7 +34,6 @@ */ #define _MAKE3D_C -#include "openaxiom-c-macros.h" #include <stdlib.h> diff --git a/src/graph/viewman/makeGraph.c b/src/graph/viewman/makeGraph.c index 331d32cf..344144ec 100644 --- a/src/graph/viewman/makeGraph.c +++ b/src/graph/viewman/makeGraph.c @@ -34,7 +34,6 @@ */ #define _MAKEGRAPH_C -#include "openaxiom-c-macros.h" #include <stdlib.h> #include <stdio.h> diff --git a/src/graph/viewman/readView.c b/src/graph/viewman/readView.c index b21cf3df..13745459 100644 --- a/src/graph/viewman/readView.c +++ b/src/graph/viewman/readView.c @@ -34,7 +34,6 @@ */ #define _READVIEW_C -#include "openaxiom-c-macros.h" #include <unistd.h> #include <stdio.h> diff --git a/src/graph/viewman/sselect.c b/src/graph/viewman/sselect.c index 68a3f869..942aa14c 100644 --- a/src/graph/viewman/sselect.c +++ b/src/graph/viewman/sselect.c @@ -34,7 +34,6 @@ */ #define _SSELECT_C -#include "openaxiom-c-macros.h" #include <stdio.h> #include <errno.h> diff --git a/src/graph/viewman/viewman.c b/src/graph/viewman/viewman.c index e5940302..34c48a71 100644 --- a/src/graph/viewman/viewman.c +++ b/src/graph/viewman/viewman.c @@ -34,7 +34,6 @@ */ #define _VIEWMAN_C -#include "openaxiom-c-macros.h" #include <unistd.h> #include <sys/time.h> diff --git a/src/hyper/ReadBitmap.c b/src/hyper/ReadBitmap.c index ee8e89d2..3ecd3bd4 100644 --- a/src/hyper/ReadBitmap.c +++ b/src/hyper/ReadBitmap.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/addfile.c b/src/hyper/addfile.c index 3671b2a5..cac8a957 100644 --- a/src/hyper/addfile.c +++ b/src/hyper/addfile.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include <sys/stat.h> #include <errno.h> diff --git a/src/hyper/cond.c b/src/hyper/cond.c index 1771ca02..4db1f352 100644 --- a/src/hyper/cond.c +++ b/src/hyper/cond.c @@ -41,7 +41,6 @@ * ****************************************************************************/ -#include "openaxiom-c-macros.h" #include "debug.h" #include "sockio.h" #include "halloc.h" diff --git a/src/hyper/debug.c b/src/hyper/debug.c index 7260ca15..c00d53d2 100644 --- a/src/hyper/debug.c +++ b/src/hyper/debug.c @@ -34,7 +34,6 @@ */ #define _DEBUG_C -#include "openaxiom-c-macros.h" #include "debug.h" diff --git a/src/hyper/dialog.c b/src/hyper/dialog.c index e3ae5122..e67ca0fd 100644 --- a/src/hyper/dialog.c +++ b/src/hyper/dialog.c @@ -43,7 +43,6 @@ #include <X11/keysym.h> #define _DIALOG_C -#include "openaxiom-c-macros.h" #include "debug.h" diff --git a/src/hyper/display.c b/src/hyper/display.c index e7d493f6..0bb5fa36 100644 --- a/src/hyper/display.c +++ b/src/hyper/display.c @@ -52,7 +52,6 @@ */ #define _DISPLAY_C -#include "openaxiom-c-macros.h" #include "debug.h" #include "sockio.h" diff --git a/src/hyper/event.c b/src/hyper/event.c index b2217805..8412df23 100644 --- a/src/hyper/event.c +++ b/src/hyper/event.c @@ -35,7 +35,6 @@ #define _EVENT_C -#include "openaxiom-c-macros.h" #include <X11/X.h> #include <X11/Xatom.h> diff --git a/src/hyper/ex2ht.c b/src/hyper/ex2ht.c index 64a55a2e..36042231 100644 --- a/src/hyper/ex2ht.c +++ b/src/hyper/ex2ht.c @@ -36,7 +36,6 @@ /* ex2ht creates a cover page for structured HyperDoc example pages */ -#include "openaxiom-c-macros.h" #include "debug.h" #include <stdio.h> diff --git a/src/hyper/extent.h b/src/hyper/extent.h index efc9ece4..4e1e2425 100644 --- a/src/hyper/extent.h +++ b/src/hyper/extent.h @@ -36,7 +36,6 @@ #ifndef _EXTENT_H_ #define _EXTENT_H_ 1 -#include "openaxiom-c-macros.h" #include "hyper.h" /* diff --git a/src/hyper/extent1.c b/src/hyper/extent1.c index 95766791..46977487 100644 --- a/src/hyper/extent1.c +++ b/src/hyper/extent1.c @@ -41,7 +41,6 @@ * ****************************************************************************/ -#include "openaxiom-c-macros.h" #include "debug.h" #include "sockio.h" #include "extent.h" diff --git a/src/hyper/extent2.c b/src/hyper/extent2.c index 10f7b923..c251e6ac 100644 --- a/src/hyper/extent2.c +++ b/src/hyper/extent2.c @@ -41,7 +41,6 @@ * ****************************************************************************/ -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/form-ext.c b/src/hyper/form-ext.c index 93d8d0b0..24c94a24 100644 --- a/src/hyper/form-ext.c +++ b/src/hyper/form-ext.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include "debug.h" #include "sockio.h" #include "extent.h" diff --git a/src/hyper/group.h b/src/hyper/group.h index 7253cd83..0a1b9d44 100644 --- a/src/hyper/group.h +++ b/src/hyper/group.h @@ -36,7 +36,6 @@ #ifndef _GROUP_H_ #define _GROUP_H_ 1 -#include "openaxiom-c-macros.h" #include "hyper.h" extern void bf_top_group(void ); diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c index b3a5962a..8457885c 100644 --- a/src/hyper/htadd.c +++ b/src/hyper/htadd.c @@ -36,7 +36,6 @@ /* HyperDoc database file manager */ -#include "openaxiom-c-macros.h" #include <errno.h> #include <setjmp.h> diff --git a/src/hyper/hthits.c b/src/hyper/hthits.c index 4e628b16..5f04bdbf 100644 --- a/src/hyper/hthits.c +++ b/src/hyper/hthits.c @@ -49,7 +49,6 @@ * SMW Feb 91 */ -#include "openaxiom-c-macros.h" #include "debug.h" diff --git a/src/hyper/htinp.c b/src/hyper/htinp.c index b44047f8..fafa992a 100644 --- a/src/hyper/htinp.c +++ b/src/hyper/htinp.c @@ -37,7 +37,6 @@ #include <sys/signal.h> #include <setjmp.h> -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/htsearch.cc b/src/hyper/htsearch.cc index b42c0b0f..d521a12f 100644 --- a/src/hyper/htsearch.cc +++ b/src/hyper/htsearch.cc @@ -41,7 +41,6 @@ * result. */ -#include "openaxiom-c-macros.h" #include <stdlib.h> #include <stdio.h> diff --git a/src/hyper/hyper.h b/src/hyper/hyper.h index 67537647..2b4b577d 100644 --- a/src/hyper/hyper.h +++ b/src/hyper/hyper.h @@ -36,7 +36,6 @@ #ifndef _HYPER_H_ #define _HYPER_H_ 1 -#include "openaxiom-c-macros.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/src/hyper/initx.c b/src/hyper/initx.c index c69c2071..911208c9 100644 --- a/src/hyper/initx.c +++ b/src/hyper/initx.c @@ -43,7 +43,6 @@ /* #define DEBUG 1 */ -#include "openaxiom-c-macros.h" #include <unistd.h> #include <sys/signal.h> diff --git a/src/hyper/input.c b/src/hyper/input.c index 2c645208..cabfdc24 100644 --- a/src/hyper/input.c +++ b/src/hyper/input.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include "debug.h" #include "sockio.h" #include "hyper.h" diff --git a/src/hyper/item.c b/src/hyper/item.c index 7bf7d724..576cc895 100644 --- a/src/hyper/item.c +++ b/src/hyper/item.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include "sockio.h" #include "debug.h" #include "halloc.h" diff --git a/src/hyper/keyin.c b/src/hyper/keyin.c index fa8af8de..e8dbf70d 100644 --- a/src/hyper/keyin.c +++ b/src/hyper/keyin.c @@ -42,7 +42,6 @@ ****************************************************************************/ #include <X11/keysym.h> -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/lex.c b/src/hyper/lex.c index ed281403..9c7edc23 100644 --- a/src/hyper/lex.c +++ b/src/hyper/lex.c @@ -57,7 +57,6 @@ * */ #define _LEX_C -#include "openaxiom-c-macros.h" #include <ctype.h> #include <setjmp.h> diff --git a/src/hyper/macro.c b/src/hyper/macro.c index 7bf0f77b..54e70f09 100644 --- a/src/hyper/macro.c +++ b/src/hyper/macro.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/parse-aux.c b/src/hyper/parse-aux.c index 24efcf89..cbfb2197 100644 --- a/src/hyper/parse-aux.c +++ b/src/hyper/parse-aux.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/parse-input.c b/src/hyper/parse-input.c index 727acc9d..f97a68eb 100644 --- a/src/hyper/parse-input.c +++ b/src/hyper/parse-input.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" /*** Contains all the code needed to parse input items, InputString diff --git a/src/hyper/parse-paste.c b/src/hyper/parse-paste.c index 06d84fa1..58ea290e 100644 --- a/src/hyper/parse-paste.c +++ b/src/hyper/parse-paste.c @@ -41,7 +41,6 @@ * ****************************************************************************/ -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/parse-paste.h b/src/hyper/parse-paste.h index cb0556b9..6b8ba74f 100644 --- a/src/hyper/parse-paste.h +++ b/src/hyper/parse-paste.h @@ -36,7 +36,6 @@ #ifndef _PARSE_PASTE_H_ #define _PARSE_PASTE_H_ 1 -#include "openaxiom-c-macros.h" #include "hyper.h" extern void parse_paste(); diff --git a/src/hyper/parse-types.c b/src/hyper/parse-types.c index e42d93f9..60a25d35 100644 --- a/src/hyper/parse-types.c +++ b/src/hyper/parse-types.c @@ -41,7 +41,6 @@ * ****************************************************************************/ -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/parse.h b/src/hyper/parse.h index 3e2c04b4..20109ba5 100644 --- a/src/hyper/parse.h +++ b/src/hyper/parse.h @@ -36,7 +36,6 @@ #ifndef _PARSE_H_ #define _PARSE_H_ 1 -#include "openaxiom-c-macros.h" #ifdef SUNplatform #include <sys/types.h> diff --git a/src/hyper/scrollbar.c b/src/hyper/scrollbar.c index 92e67ad1..2571d501 100644 --- a/src/hyper/scrollbar.c +++ b/src/hyper/scrollbar.c @@ -41,7 +41,6 @@ * ****************************************************************************/ -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/show-types.c b/src/hyper/show-types.c index e34498d8..31a02a46 100644 --- a/src/hyper/show-types.c +++ b/src/hyper/show-types.c @@ -41,7 +41,6 @@ * ****************************************************************************/ -#include "openaxiom-c-macros.h" #include "debug.h" #include "sockio.h" #include "hyper.h" diff --git a/src/hyper/spadbuf.c b/src/hyper/spadbuf.c index bfb4b377..d6f3e0b1 100644 --- a/src/hyper/spadbuf.c +++ b/src/hyper/spadbuf.c @@ -34,7 +34,6 @@ */ #define _SPADBUF_C -#include "openaxiom-c-macros.h" #include "debug.h" diff --git a/src/hyper/titlebar.c b/src/hyper/titlebar.c index 7cc21822..072284c5 100644 --- a/src/hyper/titlebar.c +++ b/src/hyper/titlebar.c @@ -42,7 +42,6 @@ ****************************************************************************/ #include <stdlib.h> -#include "openaxiom-c-macros.h" #include "debug.h" #include "halloc.h" #include "sockio.h" diff --git a/src/hyper/token.h b/src/hyper/token.h index b40d069a..f6ddbd31 100644 --- a/src/hyper/token.h +++ b/src/hyper/token.h @@ -36,7 +36,6 @@ #ifndef _TOKEN_H_ #define _TOKEN_H_ 1 -#include "openaxiom-c-macros.h" #include <stdio.h> /* diff --git a/src/include/open-axiom.h b/src/include/open-axiom.h index 7d15e4ec..5f173e33 100644 --- a/src/include/open-axiom.h +++ b/src/include/open-axiom.h @@ -34,11 +34,13 @@ #ifndef OPENAXIOM_included #define OPENAXIOM_included +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <vector> #include <string> -#include "openaxiom-c-macros.h" - /* Annotation to request C calling convention */ #ifdef __cplusplus # define OPENAXIOM_C_CALL extern "C" diff --git a/src/include/open-axiom/storage b/src/include/open-axiom/storage index fe12d1eb..1ac6cbcf 100644 --- a/src/include/open-axiom/storage +++ b/src/include/open-axiom/storage @@ -40,7 +40,6 @@ #ifndef OPENAXIOM_STORAGE_included #define OPENAXIOM_STORAGE_included -#include <open-axiom/config> #include <stddef.h> #include <new> #include <cmath> diff --git a/src/include/sockio.h b/src/include/sockio.h index f77f8d50..4b683105 100644 --- a/src/include/sockio.h +++ b/src/include/sockio.h @@ -50,7 +50,6 @@ # define OPENAXIOM_INVALID_SOCKET (-1) #endif -#include "openaxiom-c-macros.h" #include "open-axiom.h" namespace OpenAxiom { diff --git a/src/lib/XDither.c b/src/lib/XDither.c index d766633d..aac711f8 100644 --- a/src/lib/XDither.c +++ b/src/lib/XDither.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/lib/XShade.c b/src/lib/XShade.c index 590f2d2f..a5851f69 100644 --- a/src/lib/XShade.c +++ b/src/lib/XShade.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/lib/XSpadFill.c b/src/lib/XSpadFill.c index 566c57ce..0b2212e5 100644 --- a/src/lib/XSpadFill.c +++ b/src/lib/XSpadFill.c @@ -58,7 +58,6 @@ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> -#include "openaxiom-c-macros.h" #include "spadcolors.h" #include "XSpadFill.h" #include "XShade.h" diff --git a/src/lib/bsdsignal.cxx b/src/lib/bsdsignal.cxx index 07fc6b54..66e4dcd0 100644 --- a/src/lib/bsdsignal.cxx +++ b/src/lib/bsdsignal.cxx @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include <signal.h> #include "bsdsignal.h" diff --git a/src/lib/cfuns-c.cxx b/src/lib/cfuns-c.cxx index 5dbcd6bc..5cb5f338 100644 --- a/src/lib/cfuns-c.cxx +++ b/src/lib/cfuns-c.cxx @@ -34,7 +34,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <errno.h> #include <limits.h> @@ -501,11 +503,11 @@ oa_acquire_temporary_pathname() { } return strdup(buf); #elif HAVE_DECL_MKTEMP - return mktemp(copy_c_str(std::string{ oa_get_tmpdir() } + "/oa-XXXXXX")); + return mktemp(strdup((std::string{ oa_get_tmpdir() } + "/oa-XXXXXX").c_str())); #elif HAVE_DECL_TEMPNAM return tempnam(oa_get_tmpdir(), "oa-"); #else - return copy_c_str("oa-" + std::to_string(random())); + return strdup(("oa-" + std::to_string(random())).c_str()); #endif } diff --git a/src/lib/cursor.c b/src/lib/cursor.cc index 5413151d..af0b6603 100644 --- a/src/lib/cursor.c +++ b/src/lib/cursor.cc @@ -34,7 +34,6 @@ */ #include <stdlib.h> -#include "openaxiom-c-macros.h" #include "cursor.h" diff --git a/src/lib/edin.c b/src/lib/edin.cc index 568bb77a..7fee5176 100644 --- a/src/lib/edin.c +++ b/src/lib/edin.cc @@ -36,7 +36,6 @@ /* #define debug 1 */ #include <stdlib.h> -#include "openaxiom-c-macros.h" #include <unistd.h> #include <string.h> #include <stdio.h> diff --git a/src/lib/emupty.c b/src/lib/emupty.c index 7ddfbd2d..9b9848c9 100644 --- a/src/lib/emupty.c +++ b/src/lib/emupty.c @@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" /* Here is some code taken from Nick Simicich. It takes an escape sequence diff --git a/src/lib/fnct_key.c b/src/lib/fnct_key.cc index f70bc430..af0d5c28 100644 --- a/src/lib/fnct_key.c +++ b/src/lib/fnct_key.cc @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include <unistd.h> #include <stdlib.h> #include <stdio.h> diff --git a/src/lib/halloc.c b/src/lib/halloc.c index 4b19c60a..fb43d6b3 100644 --- a/src/lib/halloc.c +++ b/src/lib/halloc.c @@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" /* memory allocation used by HyperDoc and addfile */ diff --git a/src/lib/hash.c b/src/lib/hash.c index 837eb8b1..7f727ecf 100644 --- a/src/lib/hash.c +++ b/src/lib/hash.c @@ -32,7 +32,6 @@ */ -#include "openaxiom-c-macros.h" #define _HASH_C #include "debug.h" diff --git a/src/lib/openpty.c b/src/lib/openpty.cc index 5918aa7a..4262832e 100644 --- a/src/lib/openpty.c +++ b/src/lib/openpty.cc @@ -33,7 +33,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <stdlib.h> #include <unistd.h> #include <stdio.h> diff --git a/src/lib/pixmap.c b/src/lib/pixmap.c index d0ad2097..da169dfb 100644 --- a/src/lib/pixmap.c +++ b/src/lib/pixmap.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/src/lib/prt.c b/src/lib/prt.cc index ee5b3af0..831a199e 100644 --- a/src/lib/prt.c +++ b/src/lib/prt.cc @@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include <string.h> #include <stdio.h> #include <sys/types.h> diff --git a/src/lib/sockio-c.cxx b/src/lib/sockio-c.cxx index dda95ec3..c17c3398 100644 --- a/src/lib/sockio-c.cxx +++ b/src/lib/sockio-c.cxx @@ -70,9 +70,9 @@ namespace OpenAxiom { /* Note that the name AF_LOCAL is more portable than AF_UNIX, but MingW implementation and Windows documentation don't always agree. */ -#if HAVE_AF_LOCAL +#if HAVE_DECL_AF_LOCAL # define OPENAXIOM_AF_LOCAL AF_LOCAL -#elif HAVE_AF_UNIX +#elif HAVE_DECL_AF_UNIX # define OPENAXIOM_AF_LOCAL AF_UNIX #else # error "needs one of AF_LOCAL or AF_UNIX" diff --git a/src/lib/spadcolors.c b/src/lib/spadcolors.c index b8d784f2..8007b450 100644 --- a/src/lib/spadcolors.c +++ b/src/lib/spadcolors.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include "spadcolors.h" #include <X11/Xlib.h> diff --git a/src/lib/util.c b/src/lib/util.c index 198cd3bf..264590ea 100644 --- a/src/lib/util.c +++ b/src/lib/util.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "openaxiom-c-macros.h" #include <unistd.h> #include <sys/types.h> #include <stdio.h> diff --git a/src/lib/wct.c b/src/lib/wct.cc index 44510558..bac8c894 100644 --- a/src/lib/wct.c +++ b/src/lib/wct.cc @@ -41,7 +41,6 @@ * */ -#include "openaxiom-c-macros.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index 4fce2768..d5e36548 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -423,7 +423,10 @@ (eval-when (:compile-toplevel :load-toplevel :execute) (progn (setq *read-default-float-format* 'double-float) - (setq *load-verbose* nil))) + (setq *load-print* nil) + (setq *load-verbose* nil) + (setq *compile-print* nil) + (setq *compile-verbose* nil))) ;; True means that the base Lisp system uses conventional C-style ;; program linking model, whereby programs are constructed by linking @@ -673,6 +676,7 @@ (defun |getFileType|(file) (let ((file-type (pathname-type file))) (cond ((or (equal "clisp" file-type) + (equal "cl" file-type) (equal "lsp" file-type)) |$LispFileType|) (t file-type)))) diff --git a/src/sman/session.c b/src/sman/session.cc index 20a29307..20a29307 100644 --- a/src/sman/session.c +++ b/src/sman/session.cc diff --git a/src/sman/sman.c b/src/sman/sman.cc index ac941266..ac941266 100644 --- a/src/sman/sman.c +++ b/src/sman/sman.cc diff --git a/src/sman/spadclient.c b/src/sman/spadclient.cc index 85b8815e..029d354a 100644 --- a/src/sman/spadclient.c +++ b/src/sman/spadclient.cc @@ -40,7 +40,6 @@ #include <signal.h> #include <stdlib.h> -#include "openaxiom-c-macros.h" #include "sockio.h" #include "com.h" #include "bsdsignal.h" diff --git a/src/utils/command.cc b/src/utils/command.cc index 55716bc1..b0419a99 100644 --- a/src/utils/command.cc +++ b/src/utils/command.cc @@ -234,9 +234,10 @@ build_rts_options(Command* command, Driver driver) break; case Runtime::ecl: - command->rt_args.allocate(2); + command->rt_args.allocate(3); command->rt_args[0] = (char*) "-q"; - command->rt_args[1] = (char*) "-norc"; + command->rt_args[1] = (char*) "--nodebug"; + command->rt_args[1] = (char*) "--norc"; break; default: diff --git a/src/utils/hammer.cc b/src/utils/hammer.cc index 003cd1f8..36193c0b 100644 --- a/src/utils/hammer.cc +++ b/src/utils/hammer.cc @@ -152,7 +152,7 @@ namespace OpenAxiom::Hammer { CompositeText prose; // the prose around the chunks. ChunkTable defs; // chunk definition table. CompositeText* active_chunk; // chunk under construction. - const char8_t* text_start; // begining of current basic text. + const char8_t* text_start; // beginning of current basic text. // Append basic text in the range `[text_start,last)' // to the current chunk. diff --git a/src/utils/storage.cxx b/src/utils/storage.cxx index 98b0a27f..a2eb2919 100644 --- a/src/utils/storage.cxx +++ b/src/utils/storage.cxx @@ -31,6 +31,10 @@ // --%: Gabriel Dos Reis. +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <open-axiom/storage> #include <open-axiom/FileMapping> #ifdef HAVE_SYS_TYPES_H @@ -56,6 +60,14 @@ #include <stdlib.h> #include <string.h> +#if HAVE_DECL_MAP_ANONYMOUS +# define OPENAXIOM_MM_ANONYMOUS_MAP_FLAG MAP_ANONYMOUS +#elif HAVE_DECL_MAP_ANON +# define OPENAXIOM_MM_ANONYMOUS_MAP_FLAG MAP_ANON +#else +# error MAP_ANONYMOUS or MAP_ANON must be defined +#endif + namespace OpenAxiom { // ---------------- // -- SystemError -- |