aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog24
-rw-r--r--src/clef/edible.c1
-rw-r--r--src/driver/main.c2
-rw-r--r--src/driver/utils.h3
-rw-r--r--src/graph/Gdraws/Gfun.c1
-rw-r--r--src/graph/view2D/control2d.c1
-rw-r--r--src/graph/view2D/main2d.c1
-rw-r--r--src/graph/view2D/process2d.c1
-rw-r--r--src/graph/view3D/main3d.c1
-rw-r--r--src/graph/view3D/process3d.c1
-rw-r--r--src/graph/viewAlone/spoon2D.c1
-rw-r--r--src/graph/viewAlone/spoonComp.c1
-rw-r--r--src/graph/viewman/fun2D.c1
-rw-r--r--src/graph/viewman/fun3D.c1
-rw-r--r--src/hyper/extent2.c1
-rw-r--r--src/hyper/hthits.c2
-rw-r--r--src/hyper/htinp.c1
-rw-r--r--src/hyper/initx.c9
-rw-r--r--src/hyper/lex.c9
-rw-r--r--src/hyper/parse-types.c1
-rw-r--r--src/hyper/spadint.c1
-rw-r--r--src/hyper/titlebar.c2
-rw-r--r--src/lib/fnct_key.c1
-rw-r--r--src/sman/sman.c1
24 files changed, 59 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 308bcac0..5a972fef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,29 @@
2008-10-25 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * clef/edible.c: #include "cfuns.h" for oa_getenv use.
+ * graph/Gdraws/Gfun.c: Likewise.
+ * graph/view2D/control2d.c: Likewise.
+ * graph/view2D/main2d.c: Likewise.
+ * graph/view2D/process2d.c: Likewise.
+ * graph/view3D/main3d.c: Likewise.
+ * graph/view3D/process3d.c: Likewise.
+ * graph/viewAlone/spoon2D.c: Likewise.
+ * graph/viewAlone/spoonComp.c: Likewise.
+ * graph/viewman/fun2D.c: Likewise.
+ * graph/viewman/fun3D.c: Likewise.
+ * hyper/extent2.c: Likewise.
+ * hyper/hthits.c: Likewise.
+ * hyper/htinp.c: Likewise.
+ * hyper/initx.c: Likewise.
+ * hyper/lex.c: Likewise.
+ * hyper/parse-types.c: Likewise.
+ * hyper/spadint.c: Likewise.
+ * hyper/titlebar.c: Likewise.
+ * lib/fnct_key.c: Likewise.
+ * sman/sman.c: Likewise.
+
+2008-10-25 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* include/open-axiom.h: Define WIN32_LEAN_AND_MEAN
* lib/sockio-c.c (oa_inet_pton) [__WIN32__]: Use inet_addr.
diff --git a/src/clef/edible.c b/src/clef/edible.c
index 0a65cd4f..069ff8f7 100644
--- a/src/clef/edible.c
+++ b/src/clef/edible.c
@@ -56,6 +56,7 @@
#include "wct.H1"
#include "edible.H1"
#include "fnct_key.H1"
+#include "cfuns.h"
#ifdef AXIOM_UNLIKELY
#define log 1
diff --git a/src/driver/main.c b/src/driver/main.c
index 82e51384..22c33779 100644
--- a/src/driver/main.c
+++ b/src/driver/main.c
@@ -37,12 +37,12 @@
as the seesion manager. */
-#include "utils.h"
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <stdio.h>
+#include "utils.h"
#define OPENAXIOM_GLOBAL_ENV "AXIOM"
diff --git a/src/driver/utils.h b/src/driver/utils.h
index 9c6b8041..fd41434a 100644
--- a/src/driver/utils.h
+++ b/src/driver/utils.h
@@ -76,4 +76,7 @@ const char* openaxiom_make_path_for(const char*, openaxiom_driver);
int openaxiom_execute_core(const openaxiom_command*, openaxiom_driver);
void openaxiom_build_rts_options(openaxiom_command*, openaxiom_driver);
+openaxiom_driver
+ openaxiom_preprocess_arguments(openaxiom_command*, int, char**);
+
#endif /* OPENAXIOM_UTILS_INCLUDED */
diff --git a/src/graph/Gdraws/Gfun.c b/src/graph/Gdraws/Gfun.c
index 117ebbda..7052256b 100644
--- a/src/graph/Gdraws/Gfun.c
+++ b/src/graph/Gdraws/Gfun.c
@@ -46,6 +46,7 @@
#include "hash.h"
#include "Gfun.H1"
+#include "cfuns.h"
/*
diff --git a/src/graph/view2D/control2d.c b/src/graph/view2D/control2d.c
index 8e3b82ad..eb9249b9 100644
--- a/src/graph/view2D/control2d.c
+++ b/src/graph/view2D/control2d.c
@@ -50,6 +50,7 @@
#include "Gfun.H1"
#include "XSpadFill.H1"
#include "util.H1"
+#include "cfuns.h"
#include "mouse11.bitmap"
diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index beb6e602..c5fe7070 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -49,6 +49,7 @@
#include "Gfun.H1"
#include "util.H1"
#include "XSpadFill.H1"
+#include "cfuns.h"
/**********************/
diff --git a/src/graph/view2D/process2d.c b/src/graph/view2D/process2d.c
index e85d7721..ee21886f 100644
--- a/src/graph/view2D/process2d.c
+++ b/src/graph/view2D/process2d.c
@@ -52,6 +52,7 @@
#include "util.H1"
#include "Gfun.H1"
#include "XSpadFill.H1"
+#include "cfuns.h"
static int doit=0; /* globish variable for picking/dropping/clearing - all sorts of
diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c
index 4197daf6..f55cc257 100644
--- a/src/graph/view3D/main3d.c
+++ b/src/graph/view3D/main3d.c
@@ -52,6 +52,7 @@
#include "XSpadFill.H1"
#include "XShade.H1"
#include "all_3d.H1"
+#include "cfuns.h"
/**********************/
/** global variables **/
diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c
index 211760ba..1af50a8b 100644
--- a/src/graph/view3D/process3d.c
+++ b/src/graph/view3D/process3d.c
@@ -60,6 +60,7 @@
#include "XShade.H1"
#include "XSpadFill.H1"
#include "all_3d.H1"
+#include "cfuns.h"
#define inside(A,B) (((XButtonEvent *)event)->x >= A && \
((XButtonEvent *)event)->x <= B)
diff --git a/src/graph/viewAlone/spoon2D.c b/src/graph/viewAlone/spoon2D.c
index 9ad458d8..d19b008f 100644
--- a/src/graph/viewAlone/spoon2D.c
+++ b/src/graph/viewAlone/spoon2D.c
@@ -44,6 +44,7 @@
#include "util.H1"
+#include "cfuns.h"
#include "all_alone.H1"
/* #define huhDEBUG */
diff --git a/src/graph/viewAlone/spoonComp.c b/src/graph/viewAlone/spoonComp.c
index 3c828a44..8c8dcd0e 100644
--- a/src/graph/viewAlone/spoonComp.c
+++ b/src/graph/viewAlone/spoonComp.c
@@ -44,6 +44,7 @@
#include "mode.h"
#include "util.H1"
+#include "cfuns.h"
#include "all_alone.H1"
diff --git a/src/graph/viewman/fun2D.c b/src/graph/viewman/fun2D.c
index ed49772f..7027a40b 100644
--- a/src/graph/viewman/fun2D.c
+++ b/src/graph/viewman/fun2D.c
@@ -50,6 +50,7 @@
#include "fun2D.H1"
#include "readView.H1"
#include "make2D.H1"
+#include "cfuns.h"
#define writeEach
diff --git a/src/graph/viewman/fun3D.c b/src/graph/viewman/fun3D.c
index 638641e9..f277a442 100644
--- a/src/graph/viewman/fun3D.c
+++ b/src/graph/viewman/fun3D.c
@@ -50,6 +50,7 @@
#include "fun3D.H1"
#include "make3D.H1"
#include "readView.H1"
+#include "cfuns.h"
void
funView3D(int viewCommand)
diff --git a/src/hyper/extent2.c b/src/hyper/extent2.c
index a315fd11..4cac2fe8 100644
--- a/src/hyper/extent2.c
+++ b/src/hyper/extent2.c
@@ -54,6 +54,7 @@
#include "all_hyper_proto.H1"
#include "pixmap.H1"
+#include "cfuns.h"
static int cur_height = 0;
diff --git a/src/hyper/hthits.c b/src/hyper/hthits.c
index f7162f51..00b571f8 100644
--- a/src/hyper/hthits.c
+++ b/src/hyper/hthits.c
@@ -61,6 +61,8 @@
#include <sys/stat.h>
#include <regex.h>
+#include "cfuns.h"
+
/*
* For fixed-size arrays.
*/
diff --git a/src/hyper/htinp.c b/src/hyper/htinp.c
index c1970572..c78d52bf 100644
--- a/src/hyper/htinp.c
+++ b/src/hyper/htinp.c
@@ -48,6 +48,7 @@
#include "group.h"
#include "parse.h"
#include "bsdsignal.h"
+#include "cfuns.h"
#include "all_hyper_proto.H1"
#include "sockio.h"
diff --git a/src/hyper/initx.c b/src/hyper/initx.c
index 2a4eef9a..cff60806 100644
--- a/src/hyper/initx.c
+++ b/src/hyper/initx.c
@@ -46,10 +46,6 @@
#define _INITX_C
#include "openaxiom-c-macros.h"
-#include "debug.h"
-#include "sockio.h"
-#include "initx.h"
-
#include <unistd.h>
#include <sys/signal.h>
#include <setjmp.h>
@@ -57,6 +53,10 @@
#include <X11/Xresource.h>
#include <X11/Xatom.h>
+#include "debug.h"
+#include "sockio.h"
+#include "initx.h"
+
#ifdef SUN4OS5platform
extern int gethostname(char *, int );
#endif
@@ -70,6 +70,7 @@ extern int gethostname(char *, int );
#include "all_hyper_proto.H1"
#include "util.H1"
+#include "cfuns.h"
#include "spadcolors.h"
#include "spadcolors.H1"
diff --git a/src/hyper/lex.c b/src/hyper/lex.c
index 0142fd25..3f703f4e 100644
--- a/src/hyper/lex.c
+++ b/src/hyper/lex.c
@@ -59,6 +59,10 @@
#define _LEX_C
#include "openaxiom-c-macros.h"
+#include <ctype.h>
+#include <setjmp.h>
+#include <stdlib.h>
+
#include "debug.h"
#include "sockio.h"
@@ -69,10 +73,7 @@ int useAscii;
#include "halloc.h"
#include "lex.h"
#include "node.h"
-
-#include <ctype.h>
-#include <setjmp.h>
-#include <stdlib.h>
+#include "cfuns.h"
static int get_char1(void );
static void spad_error_handler(void );
diff --git a/src/hyper/parse-types.c b/src/hyper/parse-types.c
index 44227441..ec19f66f 100644
--- a/src/hyper/parse-types.c
+++ b/src/hyper/parse-types.c
@@ -51,6 +51,7 @@
#include "hyper.h"
#include "lex.h"
#include "extent.h"
+#include "cfuns.h"
#include "all_hyper_proto.H1"
diff --git a/src/hyper/spadint.c b/src/hyper/spadint.c
index fb1189ab..fe8219a1 100644
--- a/src/hyper/spadint.c
+++ b/src/hyper/spadint.c
@@ -50,6 +50,7 @@
#include "all_hyper_proto.H1"
#include "sockio.h"
+#include "cfuns.h"
typedef struct sock_list { /* linked list of openaxiom_sio */
diff --git a/src/hyper/titlebar.c b/src/hyper/titlebar.c
index 2da6716e..f1601345 100644
--- a/src/hyper/titlebar.c
+++ b/src/hyper/titlebar.c
@@ -46,6 +46,7 @@
#include "debug.h"
#include <stdlib.h>
+
#include "halloc.h"
#include "sockio.h"
#include "titlebar.h"
@@ -53,6 +54,7 @@
#include "group.h"
#include "initx.h"
#include "parse.h"
+#include "cfuns.h"
#include "all_hyper_proto.H1"
diff --git a/src/lib/fnct_key.c b/src/lib/fnct_key.c
index 29b5ab55..f2c088ea 100644
--- a/src/lib/fnct_key.c
+++ b/src/lib/fnct_key.c
@@ -45,6 +45,7 @@
#include <sys/types.h>
#include <sys/wait.h>
+#include "cfuns.h"
#include "edible.h"
#include "bsdsignal.h"
diff --git a/src/sman/sman.c b/src/sman/sman.c
index a29edfa0..8fa71a67 100644
--- a/src/sman/sman.c
+++ b/src/sman/sman.c
@@ -53,6 +53,7 @@
#include "sockio.h"
#include "openpty.H1"
+#include "cfuns.h"
#include "utils.h"
static void process_arguments(openaxiom_command*, int, char**);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 06:05:32 +0000