diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-03-08 19:09:18 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-03-08 19:09:18 +0000 |
| commit | 6a0809d42bbfb8ae3c00431c69bff92f38e5739c (patch) | |
| tree | a1652c71b6a3ccab8773f8c02d493b3278632fc8 /src/sman | |
| parent | 8531f4c74274b8aa99168d220738227557a9c418 (diff) | |
| download | open-axiom-6a0809d42bbfb8ae3c00431c69bff92f38e5739c.tar.gz | |
* 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.
Diffstat (limited to 'src/sman')
| -rw-r--r-- | src/sman/session.c | 4 | ||||
| -rw-r--r-- | src/sman/sman.c | 4 | ||||
| -rw-r--r-- | src/sman/spadclient.c | 55 |
3 files changed, 34 insertions, 29 deletions
diff --git a/src/sman/session.c b/src/sman/session.c index 1294fe1a..cd1b2697 100644 --- a/src/sman/session.c +++ b/src/sman/session.c @@ -46,9 +46,11 @@ #ifdef SGIplatform #include <bstring.h> #endif + +#include "sockio.h" #include "com.h" #include "bsdsignal.h" -#include "sockio-c.H1" +#include "sockio.h" #include "bsdsignal.H1" #include "session.H1" diff --git a/src/sman/sman.c b/src/sman/sman.c index 6b68f76e..0bc443e9 100644 --- a/src/sman/sman.c +++ b/src/sman/sman.c @@ -1,7 +1,6 @@ /* Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. All rights reserved. - Copyright (C) 2007-2008, Gabriel Dos Reis. All rights reserved. @@ -49,12 +48,13 @@ #include <signal.h> +#include "sockio.h" #include "com.h" #include "bsdsignal.h" #include "sman.h" #include "bsdsignal.H1" -#include "sockio-c.H1" +#include "sockio.h" #include "openpty.H1" #include "utils.h" diff --git a/src/sman/spadclient.c b/src/sman/spadclient.c index a41fee2a..94b3bc9c 100644 --- a/src/sman/spadclient.c +++ b/src/sman/spadclient.c @@ -1,34 +1,36 @@ /* -Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -All rights reserved. + 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: + 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 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. + - 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. + - 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. + 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. */ @@ -38,11 +40,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <signal.h> #include "axiom-c-macros.h" +#include "sockio.h" #include "com.h" #include "bsdsignal.h" #include "bsdsignal.H1" -#include "sockio-c.H1" +#include "sockio.h" #include "spadclient.H1" Sock *sock; |