diff --git a/obm/Obm.c b/obm/Obm.c index c933d85..eb90112 100644 --- a/obm/Obm.c +++ b/obm/Obm.c @@ -413,6 +413,7 @@ int state; /* ObmActivated -- Test whether the GUI is activated, i.e., both defined * and mapped. */ +int ObmActivated (obm) register ObmContext obm; { @@ -422,6 +423,7 @@ register ObmContext obm; /* ObmStatus -- Get the Object Manager status. */ +int ObmStatus (obm, app_name, app_class) register ObmContext obm; char *app_name; @@ -455,6 +457,7 @@ register ObmContext obm; /* ObmDeliverMsg -- Deliver a message to a UI object. */ +int ObmDeliverMsg (obm, object, message) register ObmContext obm; char *object; @@ -502,6 +505,7 @@ char *message; /* ObmDeliverMsgFromFile -- Deliver a message to a UI object, taking the * message from the named text file. */ +int ObmDeliverMsgFromFile (obm, object, fname) register ObmContext obm; char *object; @@ -638,6 +642,7 @@ char *object; * parent object list is empty the list of all objects with the given name * is returned. */ +int obm_nameToObjectList (obm, object, pobjs, nobjs, objs) ObmContext obm; char *object; /* object name */ @@ -970,6 +975,7 @@ register ObjClassRec classrec; /* obmClass -- Test if a class record belongs to the given object class. */ +int obmClass (classrec, flag1, flag2) register ObjClassRec classrec; unsigned long flag1, flag2; @@ -1034,6 +1040,7 @@ ObmCallback callback; /* obmDefined -- Test if the named function is a defined client function in * the given Tcl interepter. */ +int obmClientCommand (tcl, commmand) Tcl_Interp *tcl; char *commmand; diff --git a/obm/ObmP.h b/obm/ObmP.h index 2c8906a..e34ca46 100644 --- a/obm/ObmP.h +++ b/obm/ObmP.h @@ -6,6 +6,9 @@ */ #include +#include +#include +#include #include #include #include @@ -39,6 +42,7 @@ #include #include #include +#include #include #include @@ -59,6 +63,7 @@ #include #include #include +#include #include #include @@ -66,6 +71,8 @@ #include #include +int Tcl_GetErrorLine(); +void Tcl_SetErrorLine(); /* Size limiting definitions. */ #define SZ_NAME 128 /* class or object name */ @@ -483,7 +490,8 @@ typedef unsigned char uchar; #define TRUESTR "1" #define FALSESTR "0" -extern ObmObject obmFindObject(); +extern int obmClass(); +extern ObmObject obmFindObject(); extern ObjClassRec obmGetClassrec(); extern Widget widgetGetPointer(); extern ObmCallback obmAddCallback(); diff --git a/obm/ObmW/Board.c b/obm/ObmW/Board.c index b618223..7d412d5 100644 --- a/obm/ObmW/Board.c +++ b/obm/ObmW/Board.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "BoardP.h" static void _resolve_inheritance( diff --git a/obm/ObmW/Common.c b/obm/ObmW/Common.c index 4ffef4d..8ac9e10 100644 --- a/obm/ObmW/Common.c +++ b/obm/ObmW/Common.c @@ -4,7 +4,9 @@ #include #include #include +#include #include +#include #include "Converters.h" #include "CommonP.h" #define focus_detail(detail) (detail ==NotifyAncestor ?"NotifyAncestor":detail ==NotifyVirtual ?"NotifyVirtual":detail ==NotifyInferior ?"NotifyInferior":detail ==NotifyNonlinear ?"NotifyNonlinear":detail ==NotifyNonlinearVirtual ?"NotifyNonlinearVirtual":detail ==NotifyPointer ?"NotifyPointer":detail ==NotifyPointerRoot ?"NotifyPointerRoot":detail ==NotifyDetailNone ?"NotifyDetailNone":"???") diff --git a/obm/ObmW/Container.c b/obm/ObmW/Container.c index cc13769..5d96cc6 100644 --- a/obm/ObmW/Container.c +++ b/obm/ObmW/Container.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include diff --git a/obm/ObmW/Container.h b/obm/ObmW/Container.h index a6164a9..431ffb0 100644 --- a/obm/ObmW/Container.h +++ b/obm/ObmW/Container.h @@ -2,7 +2,7 @@ #define _XawContainer_h -#include +#include /*********************************************************************** * diff --git a/obm/ObmW/Group.c b/obm/ObmW/Group.c index f34005e..ce8426c 100644 --- a/obm/ObmW/Group.c +++ b/obm/ObmW/Group.c @@ -6,6 +6,7 @@ #include "Toggle.h" #include #include +#include #include "Converters.h" #include "GroupP.h" static void _resolve_inheritance( diff --git a/obm/ObmW/GtermMarker.c b/obm/ObmW/GtermMarker.c index a3887cd..e1ffc09 100644 --- a/obm/ObmW/GtermMarker.c +++ b/obm/ObmW/GtermMarker.c @@ -3376,7 +3376,7 @@ static void gm_rect_updatePolygon (gm) Marker gm; { - register x, y; + register int x, y; register XPoint *p = gm->points; double cos_rotangle, sin_rotangle; @@ -3553,7 +3553,7 @@ static void gm_boxx_updatePolygon (gm) Marker gm; { - register x, y; + register int x, y; register XPoint *p = gm->points; double cos_rotangle, sin_rotangle; @@ -4294,7 +4294,7 @@ static void gm_pgon_updatePolygon (gm) Marker gm; { - register npts, i; + register int npts, i; register DPoint *ip = gm->pgon; register XPoint *op = gm->points; double cos_rotangle, sin_rotangle; diff --git a/obm/ObmW/HTML.c b/obm/ObmW/HTML.c index 546bfbc..5bef385 100644 --- a/obm/ObmW/HTML.c +++ b/obm/ObmW/HTML.c @@ -53,6 +53,7 @@ ****************************************************************************/ #include +#include #include "HTMLP.h" #ifdef MOTIF #include @@ -62,6 +63,7 @@ #include #endif #include +#include #define MARGIN_DEFAULT 20 diff --git a/obm/ObmW/HTMLformat.c b/obm/ObmW/HTMLformat.c index d58eed5..6ac8889 100644 --- a/obm/ObmW/HTMLformat.c +++ b/obm/ObmW/HTMLformat.c @@ -59,6 +59,7 @@ struct timezone Tz; #endif #include +#include #include #include "HTMLP.h" diff --git a/obm/ObmW/HTMLimages.c b/obm/ObmW/HTMLimages.c index fe33a6e..7b99237 100644 --- a/obm/ObmW/HTMLimages.c +++ b/obm/ObmW/HTMLimages.c @@ -53,6 +53,7 @@ ****************************************************************************/ #include +#include #include #include "HTMLP.h" #include "bitmaps/NoImage.xbm" diff --git a/obm/ObmW/HTMLjot.c b/obm/ObmW/HTMLjot.c index 75efb2b..35a03cc 100644 --- a/obm/ObmW/HTMLjot.c +++ b/obm/ObmW/HTMLjot.c @@ -54,6 +54,7 @@ /* #ifdef MOTIF */ #include +#include #include "inkstore.h" #include "HTMLP.h" diff --git a/obm/ObmW/HTMLlists.c b/obm/ObmW/HTMLlists.c index dfe3578..9745e77 100644 --- a/obm/ObmW/HTMLlists.c +++ b/obm/ObmW/HTMLlists.c @@ -53,6 +53,7 @@ ****************************************************************************/ #include +#include #include "HTML.h" /* diff --git a/obm/ObmW/HTMLwidgets.c b/obm/ObmW/HTMLwidgets.c index a4195c4..931a77b 100644 --- a/obm/ObmW/HTMLwidgets.c +++ b/obm/ObmW/HTMLwidgets.c @@ -53,6 +53,7 @@ ****************************************************************************/ #include +#include #include #include #ifdef MOTIF diff --git a/obm/ObmW/ListTree.c b/obm/ObmW/ListTree.c index 23d6747..46e902c 100644 --- a/obm/ObmW/ListTree.c +++ b/obm/ObmW/ListTree.c @@ -26,9 +26,11 @@ #include #include +#include + #include -/*#include */ +#include #include "ListTreeP.h" #ifdef USE_RDD diff --git a/obm/ObmW/MultiList.c b/obm/ObmW/MultiList.c index 1c67b2d..100c31f 100644 --- a/obm/ObmW/MultiList.c +++ b/obm/ObmW/MultiList.c @@ -52,6 +52,7 @@ */ #include +#include #include #include diff --git a/obm/ObmW/Separator.c b/obm/ObmW/Separator.c index f7669a7..d42094c 100644 --- a/obm/ObmW/Separator.c +++ b/obm/ObmW/Separator.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/obm/ObmW/Simple.c b/obm/ObmW/Simple.c index 8379783..819324d 100644 --- a/obm/ObmW/Simple.c +++ b/obm/ObmW/Simple.c @@ -5,7 +5,7 @@ #include -#include +#include #include #include #include diff --git a/obm/ObmW/SimpleMenu.c b/obm/ObmW/SimpleMenu.c index eeade45..6f0d743 100644 --- a/obm/ObmW/SimpleMenu.c +++ b/obm/ObmW/SimpleMenu.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include diff --git a/obm/ObmW/Slider2.c b/obm/ObmW/Slider2.c index 0e21638..f90b8eb 100644 --- a/obm/ObmW/Slider2.c +++ b/obm/ObmW/Slider2.c @@ -143,7 +143,7 @@ Widget XGCValues values; if (((XfwfSlider2Widget)self)->xfwfSlider2.thumbgc != NULL) XtReleaseGC(self, ((XfwfSlider2Widget)self)->xfwfSlider2.thumbgc); - if (((XfwfSlider2Widget)self)->xfwfSlider2.thumbPixmap != NULL) { + if (((XfwfSlider2Widget)self)->xfwfSlider2.thumbPixmap != 0) { mask = GCTile | GCFillStyle; values.tile = ((XfwfSlider2Widget)self)->xfwfSlider2.thumbPixmap; values.fill_style = FillTiled; @@ -525,7 +525,7 @@ WidgetClass class; create_thumbgc(self); need_redisplay = True; } else if (((XfwfSlider2Widget)self)->xfwfSlider2.thumbColor != ((XfwfSlider2Widget)old)->xfwfSlider2.thumbColor) { - ((XfwfSlider2Widget)self)->xfwfSlider2.thumbPixmap = NULL; + ((XfwfSlider2Widget)self)->xfwfSlider2.thumbPixmap = 0; create_thumbgc(self); need_redisplay = True; } diff --git a/obm/ObmW/TabString.h b/obm/ObmW/TabString.h index 9151df6..d706ad5 100644 --- a/obm/ObmW/TabString.h +++ b/obm/ObmW/TabString.h @@ -7,6 +7,10 @@ extern void XfwfDrawImageString(Display *display, Drawable drawable, GC gc, int x, int y, String string, int length, int *tabs); +extern void XfwfDrawString(Display *display, Drawable drawable, + GC gc, int x, int y, String string, int length, + int *tabs); + extern void XtabDrawString(Display *display, Drawable drawable, GC gc, int x, int y, String string, int length, int *tabs); extern int * XfwfTablist2Tabs(char *tablist); @@ -17,6 +21,7 @@ extern char * strnchr(char *s, int c, int n); #else extern void XfwfDrawImageString(); +extern void XfwfDrawString(); extern void XtabDrawString(); extern int * XfwfTablist2Tabs(); extern int XfwfTextWidth(); diff --git a/obm/ObmW/Table.c b/obm/ObmW/Table.c index ecb6e8e..9527483 100644 --- a/obm/ObmW/Table.c +++ b/obm/ObmW/Table.c @@ -29,7 +29,7 @@ Commercial usage is also possible with participation of the author. #include #include -#include +#include #include #include #include diff --git a/obm/ObmW/Table.h b/obm/ObmW/Table.h index 4c7ab5c..65e8e9d 100644 --- a/obm/ObmW/Table.h +++ b/obm/ObmW/Table.h @@ -20,7 +20,7 @@ Commercial usage is also possible with participation of the author. #include #include -#include +#include @@ -522,6 +522,10 @@ extern int XawTableGetColumnWidth Xraw_PROTO((Widget w, extern int XawTableGetColumnPixelWidth Xraw_PROTO((Widget w, int column)); +extern void XawTableSetMultiColumnWidths Xraw_PROTO((Widget w, + int *columns, + int *widths, + int ncols)); /*#########################################################################*/ diff --git a/obm/ObmW/Table3d.h b/obm/ObmW/Table3d.h index 61125ce..65321c1 100644 --- a/obm/ObmW/Table3d.h +++ b/obm/ObmW/Table3d.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include typedef enum { XawRAISED = Xraw_3d, diff --git a/obm/ObmW/Tablist2Tabs.c b/obm/ObmW/Tablist2Tabs.c index 800500f..df4e133 100644 --- a/obm/ObmW/Tablist2Tabs.c +++ b/obm/ObmW/Tablist2Tabs.c @@ -1,3 +1,4 @@ +#include #include #include #include "TabString.h" diff --git a/obm/ObmW/Xraw/3d.h b/obm/ObmW/Xraw/3d.h index 8d09ddd..6c139f8 100644 --- a/obm/ObmW/Xraw/3d.h +++ b/obm/ObmW/Xraw/3d.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include typedef enum { XawRAISED = Xraw_3d, diff --git a/obm/ObmW/Xraw/Command.h b/obm/ObmW/Xraw/Command.h index da7c227..248de96 100644 --- a/obm/ObmW/Xraw/Command.h +++ b/obm/ObmW/Xraw/Command.h @@ -27,7 +27,7 @@ SOFTWARE. #ifndef _XawCommand_h #define _XawCommand_h -#include +#include #include /* Command widget resources: diff --git a/obm/ObmW/Xraw/Container.h b/obm/ObmW/Xraw/Container.h index a6164a9..431ffb0 100644 --- a/obm/ObmW/Xraw/Container.h +++ b/obm/ObmW/Xraw/Container.h @@ -2,7 +2,7 @@ #define _XawContainer_h -#include +#include /*********************************************************************** * diff --git a/obm/ObmW/Xraw/Scrollbar.h b/obm/ObmW/Xraw/Scrollbar.h index b62c7b1..1574f50 100644 --- a/obm/ObmW/Xraw/Scrollbar.h +++ b/obm/ObmW/Xraw/Scrollbar.h @@ -35,7 +35,7 @@ SOFTWARE. ****************************************************************/ #include -#include +#include #include /* Scrollbar resources: diff --git a/obm/ObmW/Xraw/Separator.h b/obm/ObmW/Xraw/Separator.h index 6d5ad87..80934a8 100644 --- a/obm/ObmW/Xraw/Separator.h +++ b/obm/ObmW/Xraw/Separator.h @@ -7,7 +7,7 @@ * ***********************************************************************/ -#include +#include #include /* Resources: diff --git a/obm/ObmW/Xraw/SimpleP.h b/obm/ObmW/Xraw/SimpleP.h index f404470..93b9c57 100644 --- a/obm/ObmW/Xraw/SimpleP.h +++ b/obm/ObmW/Xraw/SimpleP.h @@ -3,7 +3,7 @@ #include -#include +#include #include #define SIMPLE(w) ((SimpleWidget) w)->simple diff --git a/obm/ObmW/Xraw/Table.h b/obm/ObmW/Xraw/Table.h index 4c7ab5c..1f5e0af 100644 --- a/obm/ObmW/Xraw/Table.h +++ b/obm/ObmW/Xraw/Table.h @@ -20,7 +20,7 @@ Commercial usage is also possible with participation of the author. #include #include -#include +#include diff --git a/obm/ObmW/Xraw/Table3d.h b/obm/ObmW/Xraw/Table3d.h index 8d09ddd..6c139f8 100644 --- a/obm/ObmW/Xraw/Table3d.h +++ b/obm/ObmW/Xraw/Table3d.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include typedef enum { XawRAISED = Xraw_3d, diff --git a/obm/ObmW/Xraw/TextP.h b/obm/ObmW/Xraw/TextP.h index c20e7ee..861089e 100644 --- a/obm/ObmW/Xraw/TextP.h +++ b/obm/ObmW/Xraw/TextP.h @@ -30,7 +30,7 @@ SOFTWARE. #ifndef _XawTextP_h #define _XawTextP_h -#include +#include #include #include diff --git a/obm/ObmW/Xraw/Tree.h b/obm/ObmW/Xraw/Tree.h index 7ed38fe..ba99c39 100644 --- a/obm/ObmW/Xraw/Tree.h +++ b/obm/ObmW/Xraw/Tree.h @@ -32,7 +32,7 @@ #define _XawTree_h #include -#include +#include /****************************************************************************** diff --git a/obm/ObmW/Xraw/XawAll.h b/obm/ObmW/Xraw/XawAll.h deleted file mode 100644 index 4cf0d28..0000000 --- a/obm/ObmW/Xraw/XawAll.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef _XawAll_h_ -#define _XawAll_h_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif /* _XawAll_h_ */ diff --git a/obm/ObmW/Xraw/XawInit.h b/obm/ObmW/Xraw/XawInit.h deleted file mode 100644 index cf6bcbc..0000000 --- a/obm/ObmW/Xraw/XawInit.h +++ /dev/null @@ -1,60 +0,0 @@ -/* $XConsortium: XawInit.h,v 1.4 91/07/22 19:05:25 converse Exp $ - * - * Copyright 1989 Massachusetts Institute of Technology - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of M.I.T. not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. M.I.T. makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL M.I.T. - * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#ifndef _XawInit_ -#define _XawInit_ - -#if !(defined(__STDC__) && __STDC__) && !defined(__cplusplus) && !defined(c_plusplus) && !defined(FUNCPROTO) && !defined(XTFUNCPROTO) && !defined(XAWFUNCPROTO) && !(defined(NeedFunctionPrototypes) && NeedFunctionPrototypes) -#define Xraw_NO_PROTO -#else -#define Xraw_NEED_PROTO -#endif /* __STDC__ */ - - -#ifdef Xraw_NEED_PROTO -#define Xraw_PROTO(args) args -#else -#define Xraw_PROTO(args) () -#endif - -#define Xraw_VERSION 1 -#define Xraw_REVISION 2 - -#define Xraw_3d 1 -#define Xraw_SCROLLBAR 20 -#define Xraw_TABLE 40 -#define Xraw_SEPARATOR 60 -#define Xraw_FRAME 80 - -#define streq(a,b) (XrmStringToQuark(a) == XrmStringToQuark(b)) - -#define FULL_WIDTH(w) ((w)->core.width + ((w)->core.border_width << 1)) -#define FULL_HEIGHT(w) ((w)->core.height + ((w)->core.border_width << 1)) -#define WNULL (Widget)NULL - -/* called from ClassInit procs */ -extern void XawInitializeWidgetSet Xraw_PROTO((void)); - -#if defined(XtSpecificationRelease) && XtSpecificationRelease < 5 -#define XPointer XtPointer -#endif - -#endif /* _XawInit_ */ diff --git a/obm/ObmW/Xraw/color.h b/obm/ObmW/Xraw/color.h index 47351d7..99c3b93 100644 --- a/obm/ObmW/Xraw/color.h +++ b/obm/ObmW/Xraw/color.h @@ -53,7 +53,7 @@ #ifndef _color_h_ #define _color_h_ -#include +#include typedef struct _RGB { unsigned short r, g, b; diff --git a/obm/ObmW/cvtLong.c b/obm/ObmW/cvtLong.c index 710b22a..a5fd286 100644 --- a/obm/ObmW/cvtLong.c +++ b/obm/ObmW/cvtLong.c @@ -6,6 +6,7 @@ 13 Aug 1993 */ +#include #include #include #include "Converters.h" diff --git a/obm/geom.c b/obm/geom.c index ac5db51..4b37bdd 100644 --- a/obm/geom.c +++ b/obm/geom.c @@ -5,6 +5,7 @@ #include #include #include +#include /* * GEOM.C -- Code to get geometry information for a window. This code was diff --git a/obmsh/obmsh.c b/obmsh/obmsh.c index 918aabf..dab178f 100644 --- a/obmsh/obmsh.c +++ b/obmsh/obmsh.c @@ -1,4 +1,6 @@ #include +#include +#include #include #include #include @@ -27,6 +29,7 @@ static void output(); /* MAIN -- OBMSH main program. */ +int main (argc, argv) int argc; char *argv[]; diff --git a/xgterm/gtermio.c b/xgterm/gtermio.c index faf961e..b99932a 100644 --- a/xgterm/gtermio.c +++ b/xgterm/gtermio.c @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include #include diff --git a/xgterm/misc.c b/xgterm/misc.c index 2009334..f33a81a 100644 --- a/xgterm/misc.c +++ b/xgterm/misc.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/xgterm/screen.c b/xgterm/screen.c index f89cb71..7c854d6 100644 --- a/xgterm/screen.c +++ b/xgterm/screen.c @@ -32,6 +32,7 @@ #include "data.h" #include +#include #include #ifdef SVR4 #include diff --git a/xgterm/scrollbar.c b/xgterm/scrollbar.c index e74a235..d60d5ed 100644 --- a/xgterm/scrollbar.c +++ b/xgterm/scrollbar.c @@ -28,6 +28,7 @@ #include "ptyx.h" /* gets Xt headers, too */ #include +#include #include #include diff --git a/ximtool/eps.c b/ximtool/eps.c index ec7f83a..7bd645a 100644 --- a/ximtool/eps.c +++ b/ximtool/eps.c @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/ximtool/fitsio.c b/ximtool/fitsio.c index 7cfbf80..5586341 100644 --- a/ximtool/fitsio.c +++ b/ximtool/fitsio.c @@ -23,6 +23,7 @@ #include #include #include +#include #define NCARDS 36 #define BLOCKSIZE 2880 diff --git a/ximtool/gifio.c b/ximtool/gifio.c index 43b2464..3859da9 100644 --- a/ximtool/gifio.c +++ b/ximtool/gifio.c @@ -21,6 +21,7 @@ #include #include +#include /* a code_int must be able to hold 2**GIFBITS values of type int, and also -1 diff --git a/ximtool/iis.c b/ximtool/iis.c index fe3b2db..fe0f1d0 100644 --- a/ximtool/iis.c +++ b/ximtool/iis.c @@ -1,11 +1,14 @@ #include #include +#include #include #include #include #include #include #include +#include +#include #include #include @@ -93,6 +96,7 @@ extern int errno; * UNIX domain socket connection. All three types of server ports are * simultaneously ready to receive client connections. */ +int xim_iisOpen (xim) register XimDataPtr xim; { diff --git a/ximtool/irafio.c b/ximtool/irafio.c index e90ec50..1706ece 100644 --- a/ximtool/irafio.c +++ b/ximtool/irafio.c @@ -17,6 +17,7 @@ #include #endif #include +#include #define VERSION_1 1 diff --git a/ximtool/ism.c b/ximtool/ism.c index 977cfbd..e011d82 100644 --- a/ximtool/ism.c +++ b/ximtool/ism.c @@ -1,5 +1,8 @@ #include #include +#include +#include + #include #include #include @@ -43,7 +46,6 @@ #define MAXCONN 5 #define MAX_TRY 5 -void xim_ismOpen(), xim_ismClose(); IsmModule ismNameToPtr(); static void ism_connectClient(), ism_disconnectClient(), ism_io(); @@ -103,7 +105,7 @@ register XimDataPtr xim; char *dev = ism_path; while (1) { - if (*dev == (char)NULL) { + if (*dev == '\0') { dev = ism_path; break; } else if (*dev == ':') { @@ -532,6 +534,7 @@ char *text; * send messages to the ISM, which will be ignored if the client is not * connected. */ +void ism_evaluate (xim, object, command) register XimDataPtr xim; char *object; @@ -559,6 +562,7 @@ char *command; /* ISM_MESSAGE -- Convenience wrapper for the evaluate procedure. */ +int ism_message (xim, object, command) register XimDataPtr xim; char *object, *command; @@ -629,6 +633,7 @@ register XimDataPtr xim; * return zero if this is a new object. We keep a list so we don't keep * creating the same object in the OBM each time a client connects. */ +int ismObjects (name) char *name; { diff --git a/ximtool/load.c b/ximtool/load.c index 665f6cf..3091983 100644 --- a/ximtool/load.c +++ b/ximtool/load.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include diff --git a/ximtool/quant.c b/ximtool/quant.c index 4335de0..770635e 100644 --- a/ximtool/quant.c +++ b/ximtool/quant.c @@ -1,4 +1,7 @@ #include +#include +#include +#include /* QUANT.C -- Quantize the colors in a pixmap down to a specified number. ** This code is largely stolen from PBMPlus by Jef Poskanzer. diff --git a/ximtool/rasio.c b/ximtool/rasio.c index 6440025..bb79df5 100644 --- a/ximtool/rasio.c +++ b/ximtool/rasio.c @@ -1,6 +1,8 @@ #include +#include #include #include +#include /* * RASIO.C -- Routines to load and save Sun rasterfiles. diff --git a/ximtool/raster.c b/ximtool/raster.c index 90922ee..ace9160 100644 --- a/ximtool/raster.c +++ b/ximtool/raster.c @@ -1,6 +1,10 @@ #include +#include +#include #include #include +#include +#include #include #include diff --git a/ximtool/save.c b/ximtool/save.c index 51d5b7c..28d4330 100644 --- a/ximtool/save.c +++ b/ximtool/save.c @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/ximtool/tiffio.c b/ximtool/tiffio.c index 1f25833..cf26a55 100644 --- a/ximtool/tiffio.c +++ b/ximtool/tiffio.c @@ -6,10 +6,12 @@ */ #include +#include #ifdef ULTRIX #include #endif #include +#include /* TIFF Tag description diff --git a/ximtool/ximclient.c b/ximtool/ximclient.c index f6f3521..2dfcb75 100644 --- a/ximtool/ximclient.c +++ b/ximtool/ximclient.c @@ -1,4 +1,6 @@ #include +#include +#include #include #include #include diff --git a/ximtool/ximtool.c b/ximtool/ximtool.c index abb84d9..667e186 100644 --- a/ximtool/ximtool.c +++ b/ximtool/ximtool.c @@ -3,6 +3,8 @@ #include #include #include +#include +#include #include #include #include @@ -51,11 +53,13 @@ typedef void (*SIGFUNC)(); #endif void xim_onsig(); - +void Usage(); +void printoption(); /* MAIN -- XImtool main program. This is the only ximtool routine containing * window system specific code. */ +int main (argc, argv) int argc; char *argv[]; @@ -401,6 +405,7 @@ char *argv[]; /* XIM_SHUTDOWN -- Terminate ximtool. */ +int xim_shutdown (xim) register XimDataPtr xim; { @@ -445,6 +450,7 @@ XtPointer id; /* USAGE -- Print a list of command-line options. */ +void Usage () { fprintf (stderr, "Usage:\n\n"); @@ -485,6 +491,7 @@ Usage () /* PRINTOPTION -- Pretty-print an option string. */ static int cpos = 0; +void printoption(st) char *st; { @@ -501,6 +508,7 @@ char *st; * will cause us to crash with a BadMatch error. Instead, abort with a * more informative message so the user can correct the visual. */ +int xim_badVisual (depth, class) int depth; int class; @@ -556,6 +564,7 @@ int class; * depending upon the value of the environment variable XGXERROR, if defined. */ /*ARGSUSED*/ +int xerror (display, event) Display *display; register XErrorEvent *event; @@ -599,6 +608,7 @@ register XErrorEvent *event; /*ARGSUSED*/ +int xioerror(dpy) Display *dpy; { diff --git a/ximtool/ximtool.h b/ximtool/ximtool.h index 4d55f0e..15b8dca 100644 --- a/ximtool/ximtool.h +++ b/ximtool/ximtool.h @@ -724,10 +724,11 @@ void ximp_rename(), ximp_cancel(); void xims_rename(), xims_cancel(); int xim_saveFile(); -int xim_iisopen(); -void xim_iisclose(), xim_iisio(); +int xim_iisOpen(); +void xim_iisClose(), xim_iisio(); XtPointer xim_addInput(); void xim_removeInput(); void xim_clientOpen(), xim_clientClose(); int xim_clientExecute(); +void xim_ismOpen(), xim_ismClose(); diff --git a/ximtool/zscale.c b/ximtool/zscale.c index b516a5e..47ef7bb 100644 --- a/ximtool/zscale.c +++ b/ximtool/zscale.c @@ -1,4 +1,6 @@ #include +#include +#include #include /* diff --git a/xtapemon/types.c b/xtapemon/types.c index b26a7ab..383b5ac 100644 --- a/xtapemon/types.c +++ b/xtapemon/types.c @@ -9,10 +9,11 @@ #include #include #include +#include #include #include #include "types.h" -extern void XmuConvertStringToWidget(); /* original converter */ + /* * Functions defined here: diff --git a/xtapemon/xtapemon.c b/xtapemon/xtapemon.c index 63e6664..2bd3c94 100644 --- a/xtapemon/xtapemon.c +++ b/xtapemon/xtapemon.c @@ -1,4 +1,7 @@ #include +#include +#include +#include #include #include #include @@ -25,6 +28,7 @@ #include "xtapemon.h" #include "classnames.h" #include "patchlevel.h" +#include "types.h" /* * XTAPEMON -- X window system based tape monitoring utility. @@ -44,8 +48,6 @@ #define SZ_LINE 512 #define SZ_MSGBUF 2048 -extern errno; - /* Functions defined in this file. */ int main(); @@ -60,7 +62,7 @@ static void initGraphics(), initWidgets(); static void selectItem(), portClose(); static void syntax(), appendText(); static void Quit(); -static XtInputCallbackProc connectToClient(), readClientData(); +static void connectToClient(), readClientData(); /* Global graphics data. */ @@ -126,6 +128,7 @@ void *memmove(a,b,n) void *a, *b; int n; { bcopy(b,a,n); } /* * The main program. */ +int main(argc,argv) int argc; char **argv; @@ -308,7 +311,7 @@ char *resourceStr,*resourceName; * the xtapemon socket. Accept the connection and open a file pointer on * the status output stream of the client. */ -static XtInputCallbackProc +static void connectToClient (client_data, source, id) XtPointer client_data; int *source; @@ -342,7 +345,7 @@ XtInputId *id; /* readClientData -- Called when there is client data to be read and * displayed. */ -static XtInputCallbackProc +static void readClientData (client_data, source, id) XtPointer client_data; int *source; @@ -524,7 +527,7 @@ char *text; for (ip=text; *ip; ) *op++ = *ip++; - if (newline = (*(ip-1) == '\n')) + if ((newline = (*(ip-1) == '\n'))) op--; *op = EOS; @@ -610,7 +613,7 @@ portOpen (s) int s; { int fd; - if ((fd = accept (s, (struct sockaddr *)0, (int *)0)) < 0) + if ((fd = accept (s, NULL, NULL)) < 0) return (ERR); else return (fd);