More function declaration stuff

iraf-community · Jun 5, 2020 · c4d4f17 · c4d4f17
1 parent 227f070
commit c4d4f17
Show file tree

Hide file tree

Showing 63 changed files with 133 additions and 147 deletions.
diff --git 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
@@ -6,6 +6,9 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -39,6 +42,7 @@
 #include <X11/Xaw/Toggle.h>
 #include <X11/Xaw/Tree.h>
 #include <X11/Xaw/Viewport.h>
+#include <X11/Xmu/WinUtil.h>
 
 #include <ObmW/Arrow.h>
 #include <ObmW/Board.h>
@@ -59,13 +63,16 @@
 #include <ObmW/Scrollbar.h>
 #include <ObmW/Slider2.h>
 #include <ObmW/Tabs.h>
+#include <ObmW/Table.h>
 #include <ObmW/Toggle.h>
 
 #include <X11/Xraw/Separator.h>
 #include <X11/Xraw/Table.h>
 
 #include <X11/xpm.h>
 #include <tcl/tcl.h>
+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
@@ -5,6 +5,7 @@
 #include <X11/StringDefs.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <X11/Shell.h>
 #include "BoardP.h"
 static void _resolve_inheritance(

diff --git a/obm/ObmW/Common.c b/obm/ObmW/Common.c
@@ -4,7 +4,9 @@
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <stdio.h>
+#include <ctype.h>
 #include <X11/Xmu/Converters.h>
+#include <X11/Xmu/CharSet.h>
 #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
@@ -2,7 +2,7 @@
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 #include <X11/Xraw/3d.h>
 #include <X11/Xraw/ContainerP.h>
 

diff --git a/obm/ObmW/Container.h b/obm/ObmW/Container.h
@@ -2,7 +2,7 @@
 #define _XawContainer_h
 
 
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 
 /***********************************************************************
  *

diff --git a/obm/ObmW/Group.c b/obm/ObmW/Group.c
@@ -6,6 +6,7 @@
 #include "Toggle.h"
 #include <stdio.h>
 #include <X11/Xmu/Converters.h>
+#include <X11/Xmu/CharSet.h>
 #include "Converters.h"
 #include "GroupP.h"
 static void _resolve_inheritance(

diff --git 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
@@ -53,6 +53,7 @@
  ****************************************************************************/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "HTMLP.h"
 #ifdef MOTIF
 #include <Xm/DrawingA.h>
@@ -62,6 +63,7 @@
 #include <X11/Xaw/Scrollbar.h>
 #endif
 #include <X11/cursorfont.h>
+#include <X11/Xmu/StdSel.h>
 
 
 #define	MARGIN_DEFAULT		20

diff --git a/obm/ObmW/HTMLformat.c b/obm/ObmW/HTMLformat.c
@@ -59,6 +59,7 @@ struct timezone Tz;
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include "HTMLP.h"
 

diff --git a/obm/ObmW/HTMLimages.c b/obm/ObmW/HTMLimages.c
@@ -53,6 +53,7 @@
  ****************************************************************************/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include "HTMLP.h"
 #include "bitmaps/NoImage.xbm"

diff --git a/obm/ObmW/HTMLjot.c b/obm/ObmW/HTMLjot.c
@@ -54,6 +54,7 @@
 /* #ifdef MOTIF */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "inkstore.h"
 #include "HTMLP.h"
 

diff --git a/obm/ObmW/HTMLlists.c b/obm/ObmW/HTMLlists.c
@@ -53,6 +53,7 @@
  ****************************************************************************/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "HTML.h"
 
 /*

diff --git a/obm/ObmW/HTMLwidgets.c b/obm/ObmW/HTMLwidgets.c
@@ -53,6 +53,7 @@
  ****************************************************************************/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #ifdef MOTIF

diff --git a/obm/ObmW/ListTree.c b/obm/ObmW/ListTree.c
@@ -26,9 +26,11 @@
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
+#include <X11/Xmu/Drawing.h>
+
 
 #include <stdio.h>
-/*#include <stdlib.h> */
+#include <stdlib.h>
 
 #include "ListTreeP.h"
 #ifdef USE_RDD

diff --git a/obm/ObmW/MultiList.c b/obm/ObmW/MultiList.c
@@ -52,6 +52,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include <X11/IntrinsicP.h>

diff --git a/obm/ObmW/Separator.c b/obm/ObmW/Separator.c
@@ -7,7 +7,7 @@
 #include <X11/StringDefs.h>
 #include <X11/Xos.h>
 
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 #include <X11/Xraw/SeparatorP.h>
 
 #include <X11/Xmu/Converters.h>

diff --git a/obm/ObmW/Simple.c b/obm/ObmW/Simple.c
@@ -5,7 +5,7 @@
 
 #include <X11/Xmu/Drawing.h>
 
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 #include <X11/Xraw/3d.h>
 #include <X11/Xraw/SimpleP.h>
 #include <X11/Xraw/ContainerP.h>

diff --git a/obm/ObmW/SimpleMenu.c b/obm/ObmW/SimpleMenu.c
@@ -43,7 +43,7 @@
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 #include <X11/Xraw/3d.h>
 #include <X11/Xraw/SimpleMenP.h>
 #include <X11/Xraw/SmeBSB.h>

diff --git 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
@@ -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
@@ -29,7 +29,7 @@ Commercial  usage is  also  possible  with  participation of the author.
 #include <X11/Xmu/Converters.h>
 #include <X11/Xmu/Drawing.h>
 
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 #include <X11/Xraw/3d.h>
 #include <X11/Xraw/TableP.h>
 #include <X11/Xraw/TableUtil.h>

diff --git 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 <X11/Xmu/Converters.h>
 
 #include <X11/Xraw/Simple.h>
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 
 
 
@@ -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
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 
 typedef enum {
   XawRAISED = Xraw_3d,

diff --git a/obm/ObmW/Tablist2Tabs.c b/obm/ObmW/Tablist2Tabs.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include "TabString.h"

diff --git a/obm/ObmW/Xraw/3d.h b/obm/ObmW/Xraw/3d.h
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 
 typedef enum {
   XawRAISED = Xraw_3d,

diff --git a/obm/ObmW/Xraw/Command.h b/obm/ObmW/Xraw/Command.h
@@ -27,7 +27,7 @@ SOFTWARE.
 #ifndef _XawCommand_h
 #define _XawCommand_h
 
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 #include <X11/Xraw/Label.h>
 
 /* Command widget resources:

diff --git a/obm/ObmW/Xraw/Container.h b/obm/ObmW/Xraw/Container.h
@@ -2,7 +2,7 @@
 #define _XawContainer_h
 
 
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 
 /***********************************************************************
  *

diff --git a/obm/ObmW/Xraw/Scrollbar.h b/obm/ObmW/Xraw/Scrollbar.h
@@ -35,7 +35,7 @@ SOFTWARE.
  ****************************************************************/
 
 #include <X11/Xmu/Converters.h>
-#include <X11/Xraw/XawInit.h>
+#include <X11/Xraw/XrawInit.h>
 #include <X11/Xraw/Simple.h>
 
 /* Scrollbar resources: