diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Scrollbar.c | 8 | ||||
| -rw-r--r-- | src/Text.c | 5 | ||||
| -rw-r--r-- | src/TextPop.c | 5 | ||||
| -rw-r--r-- | src/Viewport.c | 4 |
5 files changed, 15 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index c70959c..d74ccc4 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,7 @@ AC_PROG_LEX PKG_CHECK_MODULES(X11, [x11 xt xmu xext]) AC_CHECK_HEADERS([wctype.h wchar.h widec.h]) AC_CHECK_FUNCS([iswspace]) +AC_TYPE_INTPTR_T XAW3D_CPPFLAGS= diff --git a/src/Scrollbar.c b/src/Scrollbar.c index 98aac74..429a660 100644 --- a/src/Scrollbar.c +++ b/src/Scrollbar.c @@ -69,6 +69,8 @@ SOFTWARE. #include <X11/Xmu/Drawing.h> +#include <stdint.h> + /* Private definitions. */ #ifdef XAW_ARROW_SCROLLBARS @@ -785,7 +787,7 @@ RepeatNotify(XtPointer client_data, XtIntervalId *idp) { #define A_FEW_PIXELS 5 ScrollbarWidget sbw = (ScrollbarWidget) client_data; - int call_data; + intptr_t call_data; if (sbw->scrollbar.scroll_mode != 1 && sbw->scrollbar.scroll_mode != 3) { sbw->scrollbar.timer_id = (XtIntervalId) 0; return; @@ -874,7 +876,7 @@ static void NotifyScroll (Widget w, XEvent *event, String *params, Cardinal *num_params) { ScrollbarWidget sbw = (ScrollbarWidget) w; - int call_data; + intptr_t call_data; Position x, y; if (sbw->scrollbar.scroll_mode == 2 /* if scroll continuous */ @@ -920,7 +922,7 @@ static void NotifyScroll (Widget w, XEvent *event, String *params, Cardinal *num_params) { ScrollbarWidget sbw = (ScrollbarWidget) w; - int call_data; + intptr_t call_data; char style; Position x, y; @@ -58,6 +58,7 @@ SOFTWARE. #ifdef XAW_INTERNATIONALIZATION #include "XawI18n.h" #endif +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <X11/Xmu/Atoms.h> @@ -1271,7 +1272,7 @@ HScroll(Widget w, XtPointer closure, XtPointer callData) { TextWidget ctx = (TextWidget) closure; Widget tw = (Widget) ctx; - Position old_left, pixels = (Position)(int) callData; + Position old_left, pixels = (Position)(intptr_t) callData; XRectangle rect, t_rect; int s = ((ThreeDWidget)ctx->text.threeD)->threeD.shadow_width; @@ -1428,7 +1429,7 @@ static void VScroll(Widget w, XtPointer closure, XtPointer callData) { TextWidget ctx = (TextWidget)closure; - int height, nlines, lines = (int) callData; + int height, nlines, lines = (intptr_t) callData; height = ctx->core.height - VMargins(ctx); if (height < 1) diff --git a/src/TextPop.c b/src/TextPop.c index 5233f30..037fd5b 100644 --- a/src/TextPop.c +++ b/src/TextPop.c @@ -63,6 +63,7 @@ in this Software without prior written authorization from the X Consortium. #ifdef XAW_INTERNATIONALIZATION #include "XawI18n.h" #endif +#include <stdint.h> #include <stdio.h> #include <X11/Xos.h> /* for O_RDONLY */ #include <errno.h> @@ -805,7 +806,7 @@ DoSearch(struct SearchAndReplace * search) text.length = strlen(text.ptr); text.firstPos = 0; - dir = (XawTextScanDirection)(int) ((XPointer)XawToggleGetCurrent(search->left_toggle) - + dir = (XawTextScanDirection)(intptr_t) ((XPointer)XawToggleGetCurrent(search->left_toggle) - R_OFFSET); pos = XawTextSearch( tw, dir, &text); @@ -939,7 +940,7 @@ Replace(struct SearchAndReplace *search, Boolean once_only, Boolean show_current #endif replace.length = strlen(replace.ptr); - dir = (XawTextScanDirection)(int) ((XPointer)XawToggleGetCurrent(search->left_toggle) - + dir = (XawTextScanDirection)(intptr_t) ((XPointer)XawToggleGetCurrent(search->left_toggle) - R_OFFSET); /* CONSTCOND */ while (TRUE) { diff --git a/src/Viewport.c b/src/Viewport.c index d8b1188..abb8961 100644 --- a/src/Viewport.c +++ b/src/Viewport.c @@ -57,6 +57,8 @@ SOFTWARE. #include <X11/Xaw3d/Scrollbar.h> #include <X11/Xaw3d/ViewportP.h> +#include <stdint.h> + static void ScrollUpDownProc(Widget, XtPointer, XtPointer); static void ThumbProc(Widget, XtPointer, XtPointer); static Boolean GetGeometry(Widget, Dimension, Dimension); @@ -863,7 +865,7 @@ ScrollUpDownProc(Widget widget, XtPointer closure, XtPointer call_data) { ViewportWidget w = (ViewportWidget)closure; Widget child = w->viewport.child; - int pix = (int)call_data; + int pix = (intptr_t) call_data; Position x, y; if (child == NULL) return; /* no child to scroll. */ |