diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-10-05 10:23:44 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-10-05 10:23:44 -0400 |
| commit | f09fefa7c4435a8da7b2516204fa717abff74704 (patch) | |
| tree | 5124b93bc9baed443ff4fb25933dd982fbece7b9 | |
| parent | 29deb6dad3bbc4a1894b93123ec8c8c5440fbecd (diff) | |
| download | eclipse.platform.swt-f09fefa7c4435a8da7b2516204fa717abff74704.tar.gz eclipse.platform.swt-f09fefa7c4435a8da7b2516204fa717abff74704.tar.xz eclipse.platform.swt-f09fefa7c4435a8da7b2516204fa717abff74704.zip | |
cannot have cairo_t casts when compiling on RHEL4
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c | 16 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 4 |
2 files changed, 8 insertions, 12 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index b44af1161e..5e10070851 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -12824,12 +12824,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1render_1background) { OS_NATIVE_ENTER(env, that, _1gtk_1render_1background_FUNC); /* - gtk_render_background(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); + gtk_render_background(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); */ { OS_LOAD_FUNCTION(fp, gtk_render_background) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, cairo_t *, gdouble, gdouble, gdouble, gdouble))fp)(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); + ((void (CALLING_CONVENTION*)(jintLong, jintLong, gdouble, gdouble, gdouble, gdouble))fp)(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); } } OS_NATIVE_EXIT(env, that, _1gtk_1render_1background_FUNC); @@ -12842,12 +12842,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1render_1frame) { OS_NATIVE_ENTER(env, that, _1gtk_1render_1frame_FUNC); /* - gtk_render_frame(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); + gtk_render_frame(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); */ { OS_LOAD_FUNCTION(fp, gtk_render_frame) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, cairo_t *, gdouble, gdouble, gdouble, gdouble))fp)(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); + ((void (CALLING_CONVENTION*)(jintLong, jintLong, gdouble, gdouble, gdouble, gdouble))fp)(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); } } OS_NATIVE_EXIT(env, that, _1gtk_1render_1frame_FUNC); @@ -12860,12 +12860,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1render_1handle) { OS_NATIVE_ENTER(env, that, _1gtk_1render_1handle_FUNC); /* - gtk_render_handle(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); + gtk_render_handle(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); */ { OS_LOAD_FUNCTION(fp, gtk_render_handle) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, cairo_t *, gdouble, gdouble, gdouble, gdouble))fp)(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); + ((void (CALLING_CONVENTION*)(jintLong, jintLong, gdouble, gdouble, gdouble, gdouble))fp)(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); } } OS_NATIVE_EXIT(env, that, _1gtk_1render_1handle_FUNC); @@ -12878,12 +12878,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1render_1line) { OS_NATIVE_ENTER(env, that, _1gtk_1render_1line_FUNC); /* - gtk_render_line(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); + gtk_render_line(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); */ { OS_LOAD_FUNCTION(fp, gtk_render_line) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, cairo_t *, gdouble, gdouble, gdouble, gdouble))fp)(arg0, (cairo_t *)arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); + ((void (CALLING_CONVENTION*)(jintLong, jintLong, gdouble, gdouble, gdouble, gdouble))fp)(arg0, arg1, (gdouble)arg2, (gdouble)arg3, (gdouble)arg4, (gdouble)arg5); } } OS_NATIVE_EXIT(env, that, _1gtk_1render_1line_FUNC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 481f4fe151..a833eb2453 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -8553,7 +8553,6 @@ public static final void gtk_paint_handle(long /*int*/ style, long /*int*/ windo } /** * @method flags=dynamic - * @param cr cast=(cairo_t *) * @param x cast=(gdouble) * @param y cast=(gdouble) * @param width cast=(gdouble) @@ -8570,7 +8569,6 @@ public static final void gtk_render_frame(long /*int*/ context, long /*int*/ cr, } /** * @method flags=dynamic - * @param cr cast=(cairo_t *) * @param x cast=(gdouble) * @param y cast=(gdouble) * @param width cast=(gdouble) @@ -8800,7 +8798,6 @@ public static final void gtk_paint_vline(long /*int*/ style, long /*int*/ window } /** * @method flags=dynamic - * @param cr cast=(cairo_t *) * @param x0 cast=(gdouble) * @param y0 cast=(gdouble) * @param x1 cast=(gdouble) @@ -12643,7 +12640,6 @@ public static final void gtk_widget_get_allocation (long /*int*/ widget, GtkAllo } /** * @method flags=dynamic - * @param cr cast=(cairo_t *) * @param x cast=(gdouble) * @param y cast=(gdouble) * @param width cast=(gdouble) |