aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-07-29 19:52:43 +0000
committerdos-reis <gdr@axiomatics.org>2010-07-29 19:52:43 +0000
commit1b7a0340896d0fb7b2d99ba9c1358cac9f7b03d3 (patch)
treee0776cb40c64012874aee5767f27ee183d3ea537 /src/lib
parent17004f202c892fd4d933b94c6b7441c45a06e80b (diff)
downloadopen-axiom-1b7a0340896d0fb7b2d99ba9c1358cac9f7b03d3.tar.gz
* lib/XSpadFill.c: Tidy.
* lib/pixmap.c: Likewise. * lib/spadcolors.c: Likewise. * include/ReadBitmap.H1: Remove. * include/all_hyper_proto.H1: Likewise. * include/cond.H1: Likewise. * include/cursor.H1: Likewise. * include/dialog.H1: Likewise. * include/display.H1: Likewise. * include/event.H1: Likewise. * include/extent1.H1: Likewise. * include/extent2.H1: Likewise. * include/form_ext.H1: Likewise. * include/group.H1: Likewise. * include/htinp.H1: Likewise. * include/hyper.H1: Likewise. * include/initx.H1: Likewise. * include/input.H1: Likewise. * include/item.H1: Likewise. * include/keyin.H1: Likewise. * include/macro.H1: Likewise. * include/mem.H1: Likewise. * include/parse.H1: Likewise. * include/parse_aux.H1: Likewise. * include/parse_input.H1: Likewise. * include/parse_paste.H1: Likewise. * include/parse_types.H1: Likewise. * include/scrollbar.H1: Likewise. * include/show_types.H1: Likewise. * include/spadcolors.H1: Likewise. * include/spadint.H1: Likewise. * include/titlebar.H1: Likewise. * hyper/Makefile.in: Compile and Link with a C++ compiler. * hyper/ReadBitmap.c: Make it acceptable to a C++ compiler. * hyper/cond.c: Likewise. * hyper/dialog.c: Likewise. * hyper/display.c: Likewise. * hyper/display.h: Likewise. * hyper/event.c: Likewise. * hyper/event.h: Likewise. * hyper/extent.h: Likewise. * hyper/extent1.c: Likewise. * hyper/extent2.c: Likewise. * hyper/form-ext.c: Likewise. * hyper/group.c: Likewise. * hyper/group.h: Likewise. * hyper/htadd.c: Likewise. * hyper/htinp.c: Likewise. * hyper/hyper.c: Likewise. * hyper/hyper.h: Likewise. * hyper/initx.c: Likewise. * hyper/initx.h: Likewise. * hyper/input.c: Likewise. * hyper/item.c: Likewise. * hyper/keyin.h: Likewise. * hyper/keyin.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-paste.h: Likewise. * hyper/parse-types.h: Likewise. * hyper/parse-types.c: Likewise. * hyper/parse.h: Likewise. * hyper/parse.c: Likewise. * hyper/scrollbar.c: Likewise. * hyper/scrollbar.h: Likewise. * hyper/show-types.c: Likewise. * hyper/spadint.c: Likewise. * hyper/titlebar.c: Likewise. * hyper/titlebar.h: Likewise. * graph/view3D/smoothShade3d.c: Include spadcolors.h * graph/view3D/stuff3d.c: Likewise. * graph/include/view.h (saymem): #undef before #define. * graph/view2D/write2d.c: Include pixmap.h. * graph/view3D/process3d.c: Likewise. * graph/view3D/write3d.c: Likewise. * graph/view3D/header.h: Remove macro definition for endColor and colorStep. * include/bsdsignal.h: Remove. * include/edin.H1: Likewise. * include/fnct_key.H1: Likewise. * include/halloc.h: Likewise. * include/hash.h: Likewise. * include/prt.H1: Likewise. * include/rgb.H1: Likewise. * include/sockio.h: Likewise. * include/util.h: Likewise. * include/pixmap.h: Rename from pixmap.H1
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/XSpadFill.c7
-rw-r--r--src/lib/pixmap.c7
-rw-r--r--src/lib/spadcolors.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/XSpadFill.c b/src/lib/XSpadFill.c
index 1487d95b..6a332dba 100644
--- a/src/lib/XSpadFill.c
+++ b/src/lib/XSpadFill.c
@@ -1,7 +1,7 @@
/*
Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
All rights reserved.
- Copyright (C) Gabriel Dos Reis.
+ Copyright (C) 2007-2010, Gabriel Dos Reis.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -49,8 +49,6 @@
*/
-#include "openaxiom-c-macros.h"
-
#include <stdio.h>
#include <stdlib.h>
@@ -60,12 +58,11 @@
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
+#include "openaxiom-c-macros.h"
#include "spadcolors.h"
-
#include "XSpadFill.H1"
#include "XShade.H1"
#include "XDither.H1"
-#include "spadcolors.H1"
extern unsigned long *spadColors;
static GC stippleGC, solidGC;
diff --git a/src/lib/pixmap.c b/src/lib/pixmap.c
index de24d8e3..bc1f548f 100644
--- a/src/lib/pixmap.c
+++ b/src/lib/pixmap.c
@@ -1,6 +1,8 @@
/*
Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
All rights reserved.
+ Copyright (C) 2007-2010, 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
@@ -46,10 +48,9 @@
#include "spadcolors.h"
-
#include "halloc.h"
-#include "pixmap.H1"
-#include "spadcolors.H1"
+#include "pixmap.h"
+#include "spadcolors.h"
diff --git a/src/lib/spadcolors.c b/src/lib/spadcolors.c
index db4a8647..b8d784f2 100644
--- a/src/lib/spadcolors.c
+++ b/src/lib/spadcolors.c
@@ -1,6 +1,8 @@
/*
Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
All rights reserved.
+ Copyright (C) 2007-2010, 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
@@ -39,7 +41,7 @@
#include <stdlib.h>
#include <math.h>
-#include "spadcolors.H1"
+#include "spadcolors.h"
#include "util.H1"
#if 0