From 6a0809d42bbfb8ae3c00431c69bff92f38e5739c Mon Sep 17 00:00:00 2001 From: dos-reis <gdr@axiomatics.org> Date: Sat, 8 Mar 2008 19:09:18 +0000 Subject: * include/sockio.h: Rename from sockio-c.H1. * clef/edible.c: Don't include useproto.h. Include sockio.h * graph/view3D/surface3d.c.pamphlet: Likewise. * graph/viewman/fun2D.c.pamphlet: Likewise. * graph/viewman/fun3D.c.pamphlet: Likewise. * graph/viewman/make2D.c.pamphlet: Likewise. * graph/viewman/make3D.c.pamphlet: Likewise. * graph/viewman/makeGraph.c.pamphlet: Likewise. * graph/viewman/sselect.c.pamphlet: Likewise. * graph/viewman/viewman.c.pamphlet: Likewise. * graph/viewman/viewman.h: Likewise. * hyper/ReadBitmap.c: Likewise. * hyper/addfile.c: Likewise. * hyper/cond.c: Likewise. * hyper/debug.c: Likewise. * hyper/dialog.c: Likewise. * hyper/display.c: Likewise. * hyper/event.c: Likewise. * hyper/ex2ht.c: Likewise. * hyper/extent1.c: Likewise. * hyper/extent2.c: Likewise. * hyper/form-ext.c: Likewise. * hyper/group.c: Likewise. * hyper/halloc.c: Likewise. * hyper/hash.c: Likewise. * hyper/htadd.c: Likewise. * hyper/hterror.c: Likewise. * hyper/htinp.c: Likewise. * hyper/hyper.c: Likewise. * hyper/initx.c: Likewise. * hyper/input.c: Likewise. * hyper/item.c: Likewise. * hyper/keyin.c: Likewise. * hyper/lex.c: Likewise. * hyper/macro.c: Likewise. * hyper/mem.c: Likewise. * hyper/parse-aux.c: Likewise. * hyper/parse-input.c: Likewise. * hyper/parse-paste.c: Likewise. * hyper/parse-types.c: Likewise. * hyper/parse.c: Likewise. * hyper/scrollbar.c: Likewise. * hyper/show-types.c: Likewise. * hyper/spadbuf.c: Likewise. * hyper/spadint.c: Likewise. * hyper/titlebar.c: Likewise. * lib/sockio-c.c: Likewise. * sman/session.c: Likewise. * sman/sman.c: Likewise. * include/useproto.h: Remove. --- src/graph/view3D/process3d.c.pamphlet | 2 +- src/graph/view3D/surface3d.c.pamphlet | 2 +- src/graph/viewman/fun2D.c.pamphlet | 2 +- src/graph/viewman/fun3D.c.pamphlet | 2 +- src/graph/viewman/make2D.c.pamphlet | 2 +- src/graph/viewman/make3D.c.pamphlet | 3 +- src/graph/viewman/makeGraph.c.pamphlet | 3 +- src/graph/viewman/sselect.c.pamphlet | 3 +- src/graph/viewman/viewman.c.pamphlet | 3 +- src/graph/viewman/viewman.h | 63 ++++++++++++++++++---------------- 10 files changed, 42 insertions(+), 43 deletions(-) (limited to 'src/graph') diff --git a/src/graph/view3D/process3d.c.pamphlet b/src/graph/view3D/process3d.c.pamphlet index 3fdc608f..d6174388 100644 --- a/src/graph/view3D/process3d.c.pamphlet +++ b/src/graph/view3D/process3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _PROCESS3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include <string.h> #include <stdlib.h> @@ -65,6 +64,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "mode.h" #include "process.h" #include "draw.h" +#include "sockio.h" #include "com.h" diff --git a/src/graph/view3D/surface3d.c.pamphlet b/src/graph/view3D/surface3d.c.pamphlet index cb2bacc4..030f03bf 100644 --- a/src/graph/view3D/surface3d.c.pamphlet +++ b/src/graph/view3D/surface3d.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _SURFACE3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include <string.h> #include <math.h> @@ -58,6 +57,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "header.h" #include "draw.h" #include "mode.h" /* for #define components */ +#include "sockio.h" #include "com.h" #include "XSpadFill.H1" diff --git a/src/graph/viewman/fun2D.c.pamphlet b/src/graph/viewman/fun2D.c.pamphlet index 6556ac17..576e2696 100644 --- a/src/graph/viewman/fun2D.c.pamphlet +++ b/src/graph/viewman/fun2D.c.pamphlet @@ -62,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "actions.h" #include "util.H1" -#include "sockio-c.H1" +#include "sockio.h" #include "fun2D.H1" #include "readView.H1" #include "make2D.H1" diff --git a/src/graph/viewman/fun3D.c.pamphlet b/src/graph/viewman/fun3D.c.pamphlet index bb88e710..c8005182 100644 --- a/src/graph/viewman/fun3D.c.pamphlet +++ b/src/graph/viewman/fun3D.c.pamphlet @@ -61,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "actions.h" #include "util.H1" -#include "sockio-c.H1" +#include "sockio.h" #include "fun3D.H1" #include "make3D.H1" #include "readView.H1" diff --git a/src/graph/viewman/make2D.c.pamphlet b/src/graph/viewman/make2D.c.pamphlet index 668a0aae..35069f4c 100644 --- a/src/graph/viewman/make2D.c.pamphlet +++ b/src/graph/viewman/make2D.c.pamphlet @@ -53,7 +53,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "viewman.h" -#include "sockio-c.H1" +#include "sockio.h" #include "make2D.H1" void diff --git a/src/graph/viewman/make3D.c.pamphlet b/src/graph/viewman/make3D.c.pamphlet index b2eb99ed..61d84c82 100644 --- a/src/graph/viewman/make3D.c.pamphlet +++ b/src/graph/viewman/make3D.c.pamphlet @@ -49,14 +49,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _MAKE3D_C #include "axiom-c-macros.h" -#include "useproto.h" #include <stdlib.h> #include "viewman.h" #include "mode.h" -#include "sockio-c.H1" +#include "sockio.h" #include "make3D.H1" void diff --git a/src/graph/viewman/makeGraph.c.pamphlet b/src/graph/viewman/makeGraph.c.pamphlet index 66caa9c3..39e9b2c6 100644 --- a/src/graph/viewman/makeGraph.c.pamphlet +++ b/src/graph/viewman/makeGraph.c.pamphlet @@ -49,14 +49,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _MAKEGRAPH_C #include "axiom-c-macros.h" -#include "useproto.h" #include <stdlib.h> #include <stdio.h> #include "viewman.h" -#include "sockio-c.H1" +#include "sockio.h" #include "makeGraph.H1" graphStruct * diff --git a/src/graph/viewman/sselect.c.pamphlet b/src/graph/viewman/sselect.c.pamphlet index 6236fa01..929ced90 100644 --- a/src/graph/viewman/sselect.c.pamphlet +++ b/src/graph/viewman/sselect.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _SSELECT_C #include "axiom-c-macros.h" -#include "useproto.h" #include <stdio.h> #include <errno.h> @@ -60,7 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "viewman.h" #include "bsdsignal.h" -#include "sockio-c.H1" +#include "sockio.h" #include "bsdsignal.H1" #include "cleanup.H1" #include "sselect.H1" diff --git a/src/graph/viewman/viewman.c.pamphlet b/src/graph/viewman/viewman.c.pamphlet index 6398a0b4..f90fe853 100644 --- a/src/graph/viewman/viewman.c.pamphlet +++ b/src/graph/viewman/viewman.c.pamphlet @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _VIEWMAN_C #include "axiom-c-macros.h" -#include "useproto.h" #include <unistd.h> #include <sys/time.h> @@ -70,7 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "bsdsignal.H1" #include "util.H1" -#include "sockio-c.H1" +#include "sockio.h" #include "fun2D.H1" #include "fun3D.H1" #include "makeGraph.H1" diff --git a/src/graph/viewman/viewman.h b/src/graph/viewman/viewman.h index 3c54c576..3935f087 100755 --- a/src/graph/viewman/viewman.h +++ b/src/graph/viewman/viewman.h @@ -1,34 +1,36 @@ /* -Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -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. + Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd. + All rights reserved. + Copyriht (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. */ #include "view2D.h" @@ -46,5 +48,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define no 0 +#include "sockio.h" #include "com.h" #include "globalsM.h" -- cgit v1.2.3