From 3f7d906f8cd6edd2597a49f629bd31914de8ca08 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sat, 8 Mar 2008 20:21:56 +0000 Subject: * include/addfile.h: Move from hyper. * include/addfile.H1: Move external declarations into addfile.h. Remove. --- configure | 18 ++++++------ configure.ac | 2 +- configure.ac.pamphlet | 2 +- src/ChangeLog | 6 ++++ src/graph/Gdraws/Gfun.c.pamphlet | 1 - src/graph/Gdraws/Makefile.in | 3 +- src/graph/view2D/buttons2d.c.pamphlet | 1 - src/graph/view2D/control2d.c.pamphlet | 1 - src/graph/view2D/graph2d.c.pamphlet | 1 - src/graph/view2D/main2d.c.pamphlet | 1 - src/graph/view2D/pot2d.c.pamphlet | 1 - src/graph/view2D/process2d.c.pamphlet | 1 - src/graph/view2D/spadAction2d.c.pamphlet | 1 - src/graph/view2D/stuff2d.c.pamphlet | 1 - src/graph/view2D/viewport2D.c.pamphlet | 1 - src/graph/view2D/write2d.c.pamphlet | 1 - src/graph/view3D/buttons3d.c.pamphlet | 1 - src/graph/view3D/closeView3d.c.pamphlet | 1 - src/graph/view3D/component3d.c.pamphlet | 1 - src/graph/view3D/control3d.c.pamphlet | 2 +- src/graph/view3D/illuminate3d.c.pamphlet | 1 - src/graph/view3D/lightbut3d.c.pamphlet | 1 - src/graph/view3D/lighting3d.c.pamphlet | 1 - src/graph/view3D/main3d.c.pamphlet | 2 +- src/graph/view3D/mesh3d.c.pamphlet | 2 +- src/graph/view3D/msort3d.c.pamphlet | 2 +- src/graph/view3D/pot3d.c.pamphlet | 1 - src/graph/view3D/project3d.c.pamphlet | 1 - src/graph/view3D/quit3d.c.pamphlet | 1 - src/graph/view3D/quitbut3d.c.pamphlet | 1 - src/graph/view3D/save3d.c.pamphlet | 1 - src/graph/view3D/savebut3d.c.pamphlet | 1 - src/graph/view3D/smoothShade3d.c.pamphlet | 1 - src/graph/view3D/spadAction3d.c.pamphlet | 1 - src/graph/view3D/stuff3d.c.pamphlet | 1 - src/graph/view3D/testcol.c.pamphlet | 1 - src/graph/view3D/transform3d.c.pamphlet | 1 - src/graph/view3D/viewport3d.c.pamphlet | 1 - src/graph/view3D/volume3d.c.pamphlet | 1 - src/graph/view3D/write3d.c.pamphlet | 1 - src/graph/viewAlone/spoon2D.c.pamphlet | 1 - src/graph/viewAlone/spoonComp.c.pamphlet | 1 - src/graph/viewAlone/viewAlone.c.pamphlet | 1 - src/graph/viewman/cleanup.c.pamphlet | 1 - src/graph/viewman/fun2D.c.pamphlet | 1 - src/graph/viewman/fun3D.c.pamphlet | 1 - src/graph/viewman/make2D.c.pamphlet | 1 - src/graph/viewman/readView.c.pamphlet | 1 - src/hyper/Makefile.in | 2 +- src/hyper/addfile.c | 5 ++++ src/hyper/addfile.h | 41 -------------------------- src/hyper/htadd.c | 2 +- src/include/addfile.H1 | 10 ------- src/include/addfile.h | 48 +++++++++++++++++++++++++++++++ src/include/all_hyper_proto.H1 | 1 - 55 files changed, 77 insertions(+), 110 deletions(-) delete mode 100644 src/hyper/addfile.h delete mode 100644 src/include/addfile.H1 create mode 100644 src/include/addfile.h diff --git a/configure b/configure index 547c9326..2d7cee9c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-03-07. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-03-08. # # Report bugs to . # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.2.0-2008-03-07' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-03-07' +PACKAGE_VERSION='1.2.0-2008-03-08' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-03-08' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1387,7 +1387,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.2.0-2008-03-07 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-03-08 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1457,7 +1457,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-03-07:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-03-08:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-03-07 +OpenAxiom configure 1.2.0-2008-03-08 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1575,7 +1575,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.2.0-2008-03-07, which was +It was created by OpenAxiom $as_me 1.2.0-2008-03-08, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -25230,7 +25230,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.2.0-2008-03-07, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-03-08, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25279,7 +25279,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-03-07 +OpenAxiom config.status 1.2.0-2008-03-08 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 93d6b310..8ea1f874 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-03-07], +AC_INIT([OpenAxiom], [1.2.0-2008-03-08], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index e85bfff8..1a82eb8d 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1022,7 +1022,7 @@ information: <>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-03-07], +AC_INIT([OpenAxiom], [1.2.0-2008-03-08], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index 80a4b9ba..27ff27c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-03-08 Gabriel Dos Reis + + * include/addfile.h: Move from hyper. + * include/addfile.H1: Move external declarations into + addfile.h. Remove. + 2008-03-08 Gabriel Dos Reis * include/sockio.h: Rename from sockio-c.H1. diff --git a/src/graph/Gdraws/Gfun.c.pamphlet b/src/graph/Gdraws/Gfun.c.pamphlet index 7a42f762..c7ef9d6e 100644 --- a/src/graph/Gdraws/Gfun.c.pamphlet +++ b/src/graph/Gdraws/Gfun.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _GFUN_C -#include "useproto.h" #include #include diff --git a/src/graph/Gdraws/Makefile.in b/src/graph/Gdraws/Makefile.in index b098aa70..597116d0 100644 --- a/src/graph/Gdraws/Makefile.in +++ b/src/graph/Gdraws/Makefile.in @@ -66,8 +66,7 @@ subdir = src/graph/Gdraws/ pamphlets = Makefile.pamphlet Gfun.c.pamphlet psFiles.pamphlet HEADERS = ${IN}/Gdraws0.h ${LINC}/G.h ${LINC}/Gfun.H1 \ - ${GINC}/hash.h ${GINC}/hash.H1 ${GINC}/useproto.h \ - $(axiom_c_macros_h) + ${GINC}/hash.h ${GINC}/hash.H1 $(axiom_c_macros_h) PSFiles= ${PS}/colorpoly.ps ${PS}/colorwol.ps ${PS}/draw.ps \ ${PS}/drawIstr.ps ${PS}/drawarc.ps ${PS}/drawcolor.ps \ diff --git a/src/graph/view2D/buttons2d.c.pamphlet b/src/graph/view2D/buttons2d.c.pamphlet index 103ead1f..c0c19185 100644 --- a/src/graph/view2D/buttons2d.c.pamphlet +++ b/src/graph/view2D/buttons2d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _BUTTONS2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include diff --git a/src/graph/view2D/control2d.c.pamphlet b/src/graph/view2D/control2d.c.pamphlet index e25f61de..c45ba400 100644 --- a/src/graph/view2D/control2d.c.pamphlet +++ b/src/graph/view2D/control2d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _CONTROL2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view2D/graph2d.c.pamphlet b/src/graph/view2D/graph2d.c.pamphlet index 45d4399e..add87b5b 100644 --- a/src/graph/view2D/graph2d.c.pamphlet +++ b/src/graph/view2D/graph2d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _GRAPH2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view2D/main2d.c.pamphlet b/src/graph/view2D/main2d.c.pamphlet index 9dae841b..72135f9a 100644 --- a/src/graph/view2D/main2d.c.pamphlet +++ b/src/graph/view2D/main2d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _MAIN2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view2D/pot2d.c.pamphlet b/src/graph/view2D/pot2d.c.pamphlet index 8aef8bf1..af4addb7 100644 --- a/src/graph/view2D/pot2d.c.pamphlet +++ b/src/graph/view2D/pot2d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _POT2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "header2.h" diff --git a/src/graph/view2D/process2d.c.pamphlet b/src/graph/view2D/process2d.c.pamphlet index c8b91811..11c1c34b 100644 --- a/src/graph/view2D/process2d.c.pamphlet +++ b/src/graph/view2D/process2d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _PROCESS2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view2D/spadAction2d.c.pamphlet b/src/graph/view2D/spadAction2d.c.pamphlet index 28f3e749..69ed10bb 100644 --- a/src/graph/view2D/spadAction2d.c.pamphlet +++ b/src/graph/view2D/spadAction2d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _SPADACTION2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view2D/stuff2d.c.pamphlet b/src/graph/view2D/stuff2d.c.pamphlet index f4796fa4..d4e3d4ed 100644 --- a/src/graph/view2D/stuff2d.c.pamphlet +++ b/src/graph/view2D/stuff2d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _STUFF2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view2D/viewport2D.c.pamphlet b/src/graph/view2D/viewport2D.c.pamphlet index 20273fb9..c1632984 100644 --- a/src/graph/view2D/viewport2D.c.pamphlet +++ b/src/graph/view2D/viewport2D.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _VIEWPORT2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view2D/write2d.c.pamphlet b/src/graph/view2D/write2d.c.pamphlet index 3d91a517..66eafe26 100644 --- a/src/graph/view2D/write2d.c.pamphlet +++ b/src/graph/view2D/write2d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _WRITE2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view3D/buttons3d.c.pamphlet b/src/graph/view3D/buttons3d.c.pamphlet index 9727e581..544892b8 100644 --- a/src/graph/view3D/buttons3d.c.pamphlet +++ b/src/graph/view3D/buttons3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _BUTTONS3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "header.h" #include "cpanel.h" diff --git a/src/graph/view3D/closeView3d.c.pamphlet b/src/graph/view3D/closeView3d.c.pamphlet index 22ca3fbe..3d66aa26 100644 --- a/src/graph/view3D/closeView3d.c.pamphlet +++ b/src/graph/view3D/closeView3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _CLOSEVIEW3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include "header.h" diff --git a/src/graph/view3D/component3d.c.pamphlet b/src/graph/view3D/component3d.c.pamphlet index 3b22805d..258c5589 100644 --- a/src/graph/view3D/component3d.c.pamphlet +++ b/src/graph/view3D/component3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _COMPONENT3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "header.h" #include "draw.h" diff --git a/src/graph/view3D/control3d.c.pamphlet b/src/graph/view3D/control3d.c.pamphlet index 66148cf6..72e04c44 100644 --- a/src/graph/view3D/control3d.c.pamphlet +++ b/src/graph/view3D/control3d.c.pamphlet @@ -49,7 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _CONTROL3D_C #include "axiom-c-macros.h" -#include "useproto.h" + #include #include #include diff --git a/src/graph/view3D/illuminate3d.c.pamphlet b/src/graph/view3D/illuminate3d.c.pamphlet index 686ded74..6cc8f908 100644 --- a/src/graph/view3D/illuminate3d.c.pamphlet +++ b/src/graph/view3D/illuminate3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _ILLUMINATE3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include diff --git a/src/graph/view3D/lightbut3d.c.pamphlet b/src/graph/view3D/lightbut3d.c.pamphlet index 4543927a..f9f7c433 100644 --- a/src/graph/view3D/lightbut3d.c.pamphlet +++ b/src/graph/view3D/lightbut3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _LIGHTBUT3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "header.h" #include "cpanel.h" diff --git a/src/graph/view3D/lighting3d.c.pamphlet b/src/graph/view3D/lighting3d.c.pamphlet index 0719c4b3..adcd6850 100644 --- a/src/graph/view3D/lighting3d.c.pamphlet +++ b/src/graph/view3D/lighting3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _LIGHTING3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view3D/main3d.c.pamphlet b/src/graph/view3D/main3d.c.pamphlet index 22137d65..01674d58 100644 --- a/src/graph/view3D/main3d.c.pamphlet +++ b/src/graph/view3D/main3d.c.pamphlet @@ -49,7 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _MAIN3D_C #include "axiom-c-macros.h" -#include "useproto.h" + #include #include #include diff --git a/src/graph/view3D/mesh3d.c.pamphlet b/src/graph/view3D/mesh3d.c.pamphlet index be07bfe7..9abe377f 100644 --- a/src/graph/view3D/mesh3d.c.pamphlet +++ b/src/graph/view3D/mesh3d.c.pamphlet @@ -49,7 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _MESH3D_C #include "axiom-c-macros.h" -#include "useproto.h" + #include #include "header.h" diff --git a/src/graph/view3D/msort3d.c.pamphlet b/src/graph/view3D/msort3d.c.pamphlet index 51f01f02..73202452 100644 --- a/src/graph/view3D/msort3d.c.pamphlet +++ b/src/graph/view3D/msort3d.c.pamphlet @@ -49,7 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _MSORT3D_C #include "axiom-c-macros.h" -#include "useproto.h" + /***************************************************** * Mergesort routine * diff --git a/src/graph/view3D/pot3d.c.pamphlet b/src/graph/view3D/pot3d.c.pamphlet index cbf88752..ee8ea1fc 100644 --- a/src/graph/view3D/pot3d.c.pamphlet +++ b/src/graph/view3D/pot3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _POT3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "header.h" #include "all_3d.H1" diff --git a/src/graph/view3D/project3d.c.pamphlet b/src/graph/view3D/project3d.c.pamphlet index 2ff174b2..1d6ca193 100644 --- a/src/graph/view3D/project3d.c.pamphlet +++ b/src/graph/view3D/project3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _PROJECT3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include "header.h" diff --git a/src/graph/view3D/quit3d.c.pamphlet b/src/graph/view3D/quit3d.c.pamphlet index ffc1c726..072e45ee 100644 --- a/src/graph/view3D/quit3d.c.pamphlet +++ b/src/graph/view3D/quit3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _QUIT3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include "header.h" diff --git a/src/graph/view3D/quitbut3d.c.pamphlet b/src/graph/view3D/quitbut3d.c.pamphlet index 49957982..befa1957 100644 --- a/src/graph/view3D/quitbut3d.c.pamphlet +++ b/src/graph/view3D/quitbut3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _QUITBUT3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "header.h" #include "cpanel.h" diff --git a/src/graph/view3D/save3d.c.pamphlet b/src/graph/view3D/save3d.c.pamphlet index 8386b418..432c64ad 100644 --- a/src/graph/view3D/save3d.c.pamphlet +++ b/src/graph/view3D/save3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _SAVE3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view3D/savebut3d.c.pamphlet b/src/graph/view3D/savebut3d.c.pamphlet index 82382e5f..97645c3f 100644 --- a/src/graph/view3D/savebut3d.c.pamphlet +++ b/src/graph/view3D/savebut3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _SAVEBUT3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "header.h" #include "cpanel.h" diff --git a/src/graph/view3D/smoothShade3d.c.pamphlet b/src/graph/view3D/smoothShade3d.c.pamphlet index 03a99c4f..1d5f7986 100644 --- a/src/graph/view3D/smoothShade3d.c.pamphlet +++ b/src/graph/view3D/smoothShade3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _SMOOTHSHADE_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view3D/spadAction3d.c.pamphlet b/src/graph/view3D/spadAction3d.c.pamphlet index da8d1916..6f451bbf 100644 --- a/src/graph/view3D/spadAction3d.c.pamphlet +++ b/src/graph/view3D/spadAction3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _SPADACTION3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view3D/stuff3d.c.pamphlet b/src/graph/view3D/stuff3d.c.pamphlet index f9ae2ff6..034f853d 100644 --- a/src/graph/view3D/stuff3d.c.pamphlet +++ b/src/graph/view3D/stuff3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _STUFF3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "header.h" diff --git a/src/graph/view3D/testcol.c.pamphlet b/src/graph/view3D/testcol.c.pamphlet index 64e8ab4b..a9f6aa3f 100644 --- a/src/graph/view3D/testcol.c.pamphlet +++ b/src/graph/view3D/testcol.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _MAIN3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include #include diff --git a/src/graph/view3D/transform3d.c.pamphlet b/src/graph/view3D/transform3d.c.pamphlet index 77da7555..6061e70e 100644 --- a/src/graph/view3D/transform3d.c.pamphlet +++ b/src/graph/view3D/transform3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _TRANSFORM3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "header.h" diff --git a/src/graph/view3D/viewport3d.c.pamphlet b/src/graph/view3D/viewport3d.c.pamphlet index cb69dd3c..86869041 100644 --- a/src/graph/view3D/viewport3d.c.pamphlet +++ b/src/graph/view3D/viewport3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _VIEWPORT3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view3D/volume3d.c.pamphlet b/src/graph/view3D/volume3d.c.pamphlet index aef688cb..c3603972 100644 --- a/src/graph/view3D/volume3d.c.pamphlet +++ b/src/graph/view3D/volume3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _VOLUME3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/view3D/write3d.c.pamphlet b/src/graph/view3D/write3d.c.pamphlet index d332473d..106bad7c 100644 --- a/src/graph/view3D/write3d.c.pamphlet +++ b/src/graph/view3D/write3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _WRITE3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/viewAlone/spoon2D.c.pamphlet b/src/graph/viewAlone/spoon2D.c.pamphlet index f8a1b185..b06da50f 100644 --- a/src/graph/viewAlone/spoon2D.c.pamphlet +++ b/src/graph/viewAlone/spoon2D.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _SPOON2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/viewAlone/spoonComp.c.pamphlet b/src/graph/viewAlone/spoonComp.c.pamphlet index b4316e95..d0b72ed5 100644 --- a/src/graph/viewAlone/spoonComp.c.pamphlet +++ b/src/graph/viewAlone/spoonComp.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _SPOONCOMP_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/viewAlone/viewAlone.c.pamphlet b/src/graph/viewAlone/viewAlone.c.pamphlet index 02c294a0..5d178583 100644 --- a/src/graph/viewAlone/viewAlone.c.pamphlet +++ b/src/graph/viewAlone/viewAlone.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _VIEWALONE_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include "viewAlone.h" diff --git a/src/graph/viewman/cleanup.c.pamphlet b/src/graph/viewman/cleanup.c.pamphlet index 7400e79a..24103128 100644 --- a/src/graph/viewman/cleanup.c.pamphlet +++ b/src/graph/viewman/cleanup.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _CLEANUP_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/viewman/fun2D.c.pamphlet b/src/graph/viewman/fun2D.c.pamphlet index 576e2696..6cc08f47 100644 --- a/src/graph/viewman/fun2D.c.pamphlet +++ b/src/graph/viewman/fun2D.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _FUN2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/viewman/fun3D.c.pamphlet b/src/graph/viewman/fun3D.c.pamphlet index c8005182..f840fb0b 100644 --- a/src/graph/viewman/fun3D.c.pamphlet +++ b/src/graph/viewman/fun3D.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _FUN3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/graph/viewman/make2D.c.pamphlet b/src/graph/viewman/make2D.c.pamphlet index 35069f4c..0f4a3e3e 100644 --- a/src/graph/viewman/make2D.c.pamphlet +++ b/src/graph/viewman/make2D.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _MAKE2D_C #include "axiom-c-macros.h" -#include "useproto.h" #include "viewman.h" diff --git a/src/graph/viewman/readView.c.pamphlet b/src/graph/viewman/readView.c.pamphlet index cccc323d..36614400 100644 --- a/src/graph/viewman/readView.c.pamphlet +++ b/src/graph/viewman/readView.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _READVIEW_C #include "axiom-c-macros.h" -#include "useproto.h" #include #include diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index f3896a99..7f976173 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/Makefile.in @@ -53,7 +53,7 @@ SCRIPTS=${OUTLIB}/htsearch ${OUTLIB}/presea BINFILES= $(addprefix $(OUTLIB)/,$(bin_PROGRAMS)) -HEADERS = addfile.h display.h event.h extent.h \ +HEADERS = display.h event.h extent.h \ group.h hterror.h hyper.h initx.h keyin.h lex.h \ parse.h parse-paste.h parse-types.h scrollbar.h \ titlebar.h token.h $(axiom_c_macros_h) diff --git a/src/hyper/addfile.c b/src/hyper/addfile.c index 2eef5664..b1b97d49 100644 --- a/src/hyper/addfile.c +++ b/src/hyper/addfile.c @@ -38,6 +38,7 @@ #include "debug.h" #include "sockio.h" +#include "addfile.h" #include "hyper.h" #include "addfile.h" @@ -46,6 +47,10 @@ #include "all_hyper_proto.H1" +static int build_ht_filename(char*, char*, char*); +static int pathname(char*); +static int strpostfix(char*, char*); + char *gDatabasePath = NULL; diff --git a/src/hyper/addfile.h b/src/hyper/addfile.h deleted file mode 100644 index fd6a14e0..00000000 --- a/src/hyper/addfile.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. - All rights reserved. - Copyright (C) 2007-2008, Gabriel Dos Reis. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of The Numerical Algorithms Group Ltd. nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _ADDFILE_H_ -#define _ADDFILE_H_ 1 - -extern char *gDatabasePath; - -#endif diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c index 36595751..edc2add4 100644 --- a/src/hyper/htadd.c +++ b/src/hyper/htadd.c @@ -48,7 +48,7 @@ #include "lex.h" #include "htadd.H1" -#include "addfile.H1" +#include "addfile.h" #include "halloc.H1" #include "hash.H1" #include "hterror.H1" diff --git a/src/include/addfile.H1 b/src/include/addfile.H1 deleted file mode 100644 index 323a3c62..00000000 --- a/src/include/addfile.H1 +++ /dev/null @@ -1,10 +0,0 @@ -extern FILE * db_file_open(char * db_file); -extern void extend_ht(char * name); -extern FILE * ht_file_open(char * fname , char * aname , char * name); -extern FILE * temp_file_open(char * temp_db_file); -#ifdef _ADDFILE_C -static int build_ht_filename(char * fname , char * aname , char * name); -static int pathname(char * name); -static int strpostfix(char * s , char * t); -#endif - diff --git a/src/include/addfile.h b/src/include/addfile.h new file mode 100644 index 00000000..56dabe0b --- /dev/null +++ b/src/include/addfile.h @@ -0,0 +1,48 @@ +/* + Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. + All rights reserved. + Copyright (C) 2007-2008, Gabriel Dos Reis. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + - Neither the name of The Numerical Algorithms Group Ltd. nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef OPENAXIOM_ADDFILE_included +#define OPENAXIOM_ADDFILE_included + +#include + +extern FILE* db_file_open(char*); +extern void extend_ht(char*); +extern FILE* ht_file_open(char*, char*, char*); +extern FILE* temp_file_open(char*); + +extern char* gDatabasePath; + +#endif /* OPENAXIOM_ADDFILE_included */ diff --git a/src/include/all_hyper_proto.H1 b/src/include/all_hyper_proto.H1 index 343703bd..320e1eb1 100644 --- a/src/include/all_hyper_proto.H1 +++ b/src/include/all_hyper_proto.H1 @@ -1,4 +1,3 @@ -#include "addfile.H1" #include "ReadBitmap.H1" #include "dialog.H1" #include "cond.H1" -- cgit v1.2.3