Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2003-06-27 18:05:33 +0000
committerSilenio Quarti2003-06-27 18:05:33 +0000
commite03f359c30865ce8c63f9c9cea585169192749b6 (patch)
tree368b4e8517ba9225604f484c1fec94985eb16d3c /bundles/org.eclipse.swt/Eclipse SWT PI/photon
parentb1238464b47d773161d382e271de796cbafc54b9 (diff)
downloadeclipse.platform.swt-e03f359c30865ce8c63f9c9cea585169192749b6.tar.gz
eclipse.platform.swt-e03f359c30865ce8c63f9c9cea585169192749b6.tar.xz
eclipse.platform.swt-e03f359c30865ce8c63f9c9cea585169192749b6.zip
renaming to os
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/photon')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/make_photon.mak2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c (renamed from bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt.c)452
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.h (renamed from bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt_os.h)0
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_custom.c (renamed from bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt_custom.c)2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.c (renamed from bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.c)2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.h (renamed from bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.h)2
6 files changed, 230 insertions, 230 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/make_photon.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/make_photon.mak
index eb7813443a..a281afea4b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/make_photon.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/make_photon.mak
@@ -24,7 +24,7 @@ DEBUG =
CFLAGS = -c -shared -DSWT_VERSION=$(SWT_VERSION) -w8 $(DEBUG) -DPHOTON -I$(IVE_HOME)/include
LFLAGS = -shared -lph -lphrender
-SWT_OBJS = swt.o swt_custom.o structs.o callback.o
+SWT_OBJS = os.o os_structs.o os_custom.o callback.o
all: $(SWT_LIB)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c
index 94d86e0260..8bb24b2e44 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.c
@@ -10,7 +10,7 @@
*******************************************************************************/
#include "swt.h"
-#include "structs.h"
+#include "os_structs.h"
#define OS_NATIVE(func) Java_org_eclipse_swt_internal_photon_OS_##func
@@ -2779,6 +2779,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(PtTextGetSelection)
}
#endif
+#ifndef NO_PtTextModifyText__IIIIII
+JNIEXPORT jint JNICALL OS_NATIVE(PtTextModifyText__IIIIII)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
+{
+ jint rc;
+ NATIVE_ENTER(env, that, "PtTextModifyText__IIIIII\n")
+ rc = (jint)PtTextModifyText((PtWidget_t *)arg0, arg1, arg2, arg3, (char const *)arg4, arg5);
+ NATIVE_EXIT(env, that, "PtTextModifyText__IIIIII\n")
+ return rc;
+}
+#endif
+
#ifndef NO_PtTextModifyText__IIII_3BI
JNIEXPORT jint JNICALL OS_NATIVE(PtTextModifyText__IIII_3BI)
(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jbyteArray arg4, jint arg5)
@@ -2794,18 +2806,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(PtTextModifyText__IIII_3BI)
}
#endif
-#ifndef NO_PtTextModifyText__IIIIII
-JNIEXPORT jint JNICALL OS_NATIVE(PtTextModifyText__IIIIII)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4, jint arg5)
-{
- jint rc;
- NATIVE_ENTER(env, that, "PtTextModifyText__IIIIII\n")
- rc = (jint)PtTextModifyText((PtWidget_t *)arg0, arg1, arg2, arg3, (char const *)arg4, arg5);
- NATIVE_EXIT(env, that, "PtTextModifyText__IIIIII\n")
- return rc;
-}
-#endif
-
#ifndef NO_PtTextSetSelection
JNIEXPORT jint JNICALL OS_NATIVE(PtTextSetSelection)
(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
@@ -3242,118 +3242,97 @@ JNIEXPORT jint JNICALL OS_NATIVE(malloc)
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhPoint_1t_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhPoint_1t_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-{
- PhPoint_t _arg1, *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhPoint_1t_2I\n")
- if (arg1) lparg1 = getPhPoint_tFields(env, arg1, &_arg1);
- memmove((void *)arg0, (const void *)lparg1, arg2);
- NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhPoint_1t_2I\n")
-}
-#endif
-
-#ifndef NO_memmove___3III
-JNIEXPORT void JNICALL OS_NATIVE(memmove___3III)
- (JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
+#ifndef NO_memmove__III
+JNIEXPORT void JNICALL OS_NATIVE(memmove__III)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
{
- jint *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove___3III\n")
- if (arg0) lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL);
- memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
- NATIVE_EXIT(env, that, "memmove___3III\n")
+ NATIVE_ENTER(env, that, "memmove__III\n")
+ memmove((void *)arg0, (const void *)arg1, arg2);
+ NATIVE_EXIT(env, that, "memmove__III\n")
}
#endif
-#ifndef NO_memmove__I_3II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__I_3II)
- (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PgAlpha_1t_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PgAlpha_1t_2I)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
{
- jint *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__I_3II\n")
- if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);
+ PgAlpha_t _arg1={0}, *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PgAlpha_1t_2I\n")
+ if (arg1) lparg1 = getPgAlpha_tFields(env, arg1, &_arg1);
memmove((void *)arg0, (const void *)lparg1, arg2);
- if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, JNI_ABORT);
- NATIVE_EXIT(env, that, "memmove__I_3II\n")
+ NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PgAlpha_1t_2I\n")
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhTile_1t_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhTile_1t_2I)
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhArea_1t_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhArea_1t_2I)
(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
{
- PhTile_t _arg1, *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhTile_1t_2I\n")
- if (arg1) lparg1 = getPhTile_tFields(env, arg1, &_arg1);
+ PhArea_t _arg1, *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhArea_1t_2I\n")
+ if (arg1) lparg1 = getPhArea_tFields(env, arg1, &_arg1);
memmove((void *)arg0, (const void *)lparg1, arg2);
- NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhTile_1t_2I\n")
+ NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhArea_1t_2I\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhTile_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhTile_1t_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhCursorDef_1t_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhCursorDef_1t_2I)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
{
- PhTile_t _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhTile_1t_2II\n")
- if (arg0) lparg0 = &_arg0;
- memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPhTile_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhTile_1t_2II\n")
+ PhCursorDef_t _arg1, *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhCursorDef_1t_2I\n")
+ if (arg1) lparg1 = getPhCursorDef_tFields(env, arg1, &_arg1);
+ memmove((void *)arg0, (const void *)lparg1, arg2);
+ NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhCursorDef_1t_2I\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PtCallbackInfo_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PtCallbackInfo_1t_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhEvent_1t_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhEvent_1t_2I)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
{
- PtCallbackInfo_t _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtCallbackInfo_1t_2II\n")
- if (arg0) lparg0 = &_arg0;
- memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPtCallbackInfo_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtCallbackInfo_1t_2II\n")
+ PhEvent_t _arg1, *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhEvent_1t_2I\n")
+ if (arg1) lparg1 = getPhEvent_tFields(env, arg1, &_arg1);
+ memmove((void *)arg0, (const void *)lparg1, arg2);
+ NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhEvent_1t_2I\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhWindowEvent_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhWindowEvent_1t_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhImage_1t_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhImage_1t_2I)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
{
- PhWindowEvent_t _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhWindowEvent_1t_2II\n")
- if (arg0) lparg0 = &_arg0;
- memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPhWindowEvent_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhWindowEvent_1t_2II\n")
+ PhImage_t _arg1, *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhImage_1t_2I\n")
+ if (arg1) lparg1 = getPhImage_tFields(env, arg1, &_arg1);
+ memmove((void *)arg0, (const void *)lparg1, arg2);
+ NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhImage_1t_2I\n")
}
#endif
-#ifndef NO_memmove___3BII
-JNIEXPORT void JNICALL OS_NATIVE(memmove___3BII)
- (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2)
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhPoint_1t_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhPoint_1t_2I)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
{
- jbyte *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove___3BII\n")
- if (arg0) lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL);
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- if (arg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
- NATIVE_EXIT(env, that, "memmove___3BII\n")
+ PhPoint_t _arg1, *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhPoint_1t_2I\n")
+ if (arg1) lparg1 = getPhPoint_tFields(env, arg1, &_arg1);
+ memmove((void *)arg0, (const void *)lparg1, arg2);
+ NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhPoint_1t_2I\n")
}
#endif
-#ifndef NO_memmove__I_3BI
-JNIEXPORT void JNICALL OS_NATIVE(memmove__I_3BI)
- (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2I)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
{
- jbyte *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__I_3BI\n")
- if (arg1) lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL);
+ PhPointerEvent_t _arg1, *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2I\n")
+ if (arg1) lparg1 = getPhPointerEvent_tFields(env, arg1, &_arg1);
memmove((void *)arg0, (const void *)lparg1, arg2);
- if (arg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
- NATIVE_EXIT(env, that, "memmove__I_3BI\n")
+ NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2I\n")
}
#endif
@@ -3369,102 +3348,105 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhRe
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhRect_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhRect_1t_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhTile_1t_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhTile_1t_2I)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
{
- PhRect_t _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhRect_1t_2II\n")
- if (arg0) lparg0 = &_arg0;
- memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPhRect_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhRect_1t_2II\n")
+ PhTile_t _arg1, *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhTile_1t_2I\n")
+ if (arg1) lparg1 = getPhTile_tFields(env, arg1, &_arg1);
+ memmove((void *)arg0, (const void *)lparg1, arg2);
+ NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhTile_1t_2I\n")
}
#endif
-#ifndef NO_memmove___3SII
-JNIEXPORT void JNICALL OS_NATIVE(memmove___3SII)
- (JNIEnv *env, jclass that, jshortArray arg0, jint arg1, jint arg2)
+#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PtTextCallback_1t_2I
+JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PtTextCallback_1t_2I)
+ (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
{
- jshort *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove___3SII\n")
- if (arg0) lparg0 = (*env)->GetShortArrayElements(env, arg0, NULL);
- memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
- if (arg0) (*env)->ReleaseShortArrayElements(env, arg0, lparg0, 0);
- NATIVE_EXIT(env, that, "memmove___3SII\n")
+ PtTextCallback_t _arg1, *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PtTextCallback_1t_2I\n")
+ if (arg1) lparg1 = getPtTextCallback_tFields(env, arg1, &_arg1);
+ memmove((void *)arg0, (const void *)lparg1, arg2);
+ NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PtTextCallback_1t_2I\n")
}
#endif
-#ifndef NO_memmove__III
-JNIEXPORT void JNICALL OS_NATIVE(memmove__III)
- (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+#ifndef NO_memmove__I_3BI
+JNIEXPORT void JNICALL OS_NATIVE(memmove__I_3BI)
+ (JNIEnv *env, jclass that, jint arg0, jbyteArray arg1, jint arg2)
{
- NATIVE_ENTER(env, that, "memmove__III\n")
- memmove((void *)arg0, (const void *)arg1, arg2);
- NATIVE_EXIT(env, that, "memmove__III\n")
+ jbyte *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__I_3BI\n")
+ if (arg1) lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL);
+ memmove((void *)arg0, (const void *)lparg1, arg2);
+ if (arg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
+ NATIVE_EXIT(env, that, "memmove__I_3BI\n")
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhImage_1t_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhImage_1t_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#ifndef NO_memmove__I_3II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__I_3II)
+ (JNIEnv *env, jclass that, jint arg0, jintArray arg1, jint arg2)
{
- PhImage_t _arg1, *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhImage_1t_2I\n")
- if (arg1) lparg1 = getPhImage_tFields(env, arg1, &_arg1);
+ jint *lparg1=NULL;
+ NATIVE_ENTER(env, that, "memmove__I_3II\n")
+ if (arg1) lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL);
memmove((void *)arg0, (const void *)lparg1, arg2);
- NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhImage_1t_2I\n")
+ if (arg1) (*env)->ReleaseIntArrayElements(env, arg1, lparg1, JNI_ABORT);
+ NATIVE_EXIT(env, that, "memmove__I_3II\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhImage_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhImage_1t_2II)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_FontDetails_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_FontDetails_2II)
(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PhImage_t _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhImage_1t_2II\n")
+ FontDetails _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_FontDetails_2II\n")
if (arg0) lparg0 = &_arg0;
memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPhImage_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhImage_1t_2II\n")
+ if (arg0) setFontDetailsFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_FontDetails_2II\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_FontDetails_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_FontDetails_2II)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PgAlpha_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PgAlpha_1t_2II)
(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- FontDetails _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_FontDetails_2II\n")
+ PgAlpha_t _arg0={0}, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PgAlpha_1t_2II\n")
if (arg0) lparg0 = &_arg0;
memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setFontDetailsFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_FontDetails_2II\n")
+ if (arg0) setPgAlpha_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PgAlpha_1t_2II\n")
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PgMap_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PgMap_1t_2II)
+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PhPointerEvent_t _arg1, *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2I\n")
- if (arg1) lparg1 = getPhPointerEvent_tFields(env, arg1, &_arg1);
- memmove((void *)arg0, (const void *)lparg1, arg2);
- NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2I\n")
+ PgMap_t _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PgMap_1t_2II\n")
+ if (arg0) lparg0 = &_arg0;
+ memmove((void *)lparg0, (const void *)arg1, arg2);
+ if (arg0) setPgMap_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PgMap_1t_2II\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2II)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhClipHeader_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhClipHeader_2II)
(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PhPointerEvent_t _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2II\n")
+ PhClipHeader _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhClipHeader_2II\n")
if (arg0) lparg0 = &_arg0;
memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPhPointerEvent_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2II\n")
+ if (arg0) setPhClipHeaderFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhClipHeader_2II\n")
}
#endif
@@ -3481,15 +3463,16 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhEve
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhEvent_1t_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhEvent_1t_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhImage_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhImage_1t_2II)
+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PhEvent_t _arg1, *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhEvent_1t_2I\n")
- if (arg1) lparg1 = getPhEvent_tFields(env, arg1, &_arg1);
- memmove((void *)arg0, (const void *)lparg1, arg2);
- NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhEvent_1t_2I\n")
+ PhImage_t _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhImage_1t_2II\n")
+ if (arg0) lparg0 = &_arg0;
+ memmove((void *)lparg0, (const void *)arg1, arg2);
+ if (arg0) setPhImage_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhImage_1t_2II\n")
}
#endif
@@ -3506,116 +3489,107 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhKey
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PtScrollbarCallback_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PtScrollbarCallback_1t_2II)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2II)
(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PtScrollbarCallback_t _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtScrollbarCallback_1t_2II\n")
+ PhPointerEvent_t _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2II\n")
if (arg0) lparg0 = &_arg0;
memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPtScrollbarCallback_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtScrollbarCallback_1t_2II\n")
-}
-#endif
-
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhArea_1t_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhArea_1t_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
-{
- PhArea_t _arg1, *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhArea_1t_2I\n")
- if (arg1) lparg1 = getPhArea_tFields(env, arg1, &_arg1);
- memmove((void *)arg0, (const void *)lparg1, arg2);
- NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhArea_1t_2I\n")
+ if (arg0) setPhPointerEvent_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhPointerEvent_1t_2II\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PgAlpha_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PgAlpha_1t_2II)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhRect_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhRect_1t_2II)
(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PgAlpha_t _arg0={0}, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PgAlpha_1t_2II\n")
+ PhRect_t _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhRect_1t_2II\n")
if (arg0) lparg0 = &_arg0;
memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPgAlpha_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PgAlpha_1t_2II\n")
+ if (arg0) setPhRect_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhRect_1t_2II\n")
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PgAlpha_1t_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PgAlpha_1t_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhTile_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhTile_1t_2II)
+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PgAlpha_t _arg1={0}, *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PgAlpha_1t_2I\n")
- if (arg1) lparg1 = getPgAlpha_tFields(env, arg1, &_arg1);
- memmove((void *)arg0, (const void *)lparg1, arg2);
- NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PgAlpha_1t_2I\n")
+ PhTile_t _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhTile_1t_2II\n")
+ if (arg0) lparg0 = &_arg0;
+ memmove((void *)lparg0, (const void *)arg1, arg2);
+ if (arg0) setPhTile_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhTile_1t_2II\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PtTextCallback_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PtTextCallback_1t_2II)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhWindowEvent_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhWindowEvent_1t_2II)
(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PtTextCallback_t _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtTextCallback_1t_2II\n")
+ PhWindowEvent_t _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhWindowEvent_1t_2II\n")
if (arg0) lparg0 = &_arg0;
memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPtTextCallback_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtTextCallback_1t_2II\n")
+ if (arg0) setPhWindowEvent_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhWindowEvent_1t_2II\n")
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PtTextCallback_1t_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PtTextCallback_1t_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PtCallbackInfo_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PtCallbackInfo_1t_2II)
+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PtTextCallback_t _arg1, *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PtTextCallback_1t_2I\n")
- if (arg1) lparg1 = getPtTextCallback_tFields(env, arg1, &_arg1);
- memmove((void *)arg0, (const void *)lparg1, arg2);
- NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PtTextCallback_1t_2I\n")
+ PtCallbackInfo_t _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtCallbackInfo_1t_2II\n")
+ if (arg0) lparg0 = &_arg0;
+ memmove((void *)lparg0, (const void *)arg1, arg2);
+ if (arg0) setPtCallbackInfo_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtCallbackInfo_1t_2II\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PgMap_1t_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PgMap_1t_2II)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PtScrollbarCallback_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PtScrollbarCallback_1t_2II)
(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PgMap_t _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PgMap_1t_2II\n")
+ PtScrollbarCallback_t _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtScrollbarCallback_1t_2II\n")
if (arg0) lparg0 = &_arg0;
memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPgMap_tFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PgMap_1t_2II\n")
+ if (arg0) setPtScrollbarCallback_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtScrollbarCallback_1t_2II\n")
}
#endif
-#ifndef NO_memmove__ILorg_eclipse_swt_internal_photon_PhCursorDef_1t_2I
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_photon_PhCursorDef_1t_2I)
- (JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PtTextCallback_1t_2II
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PtTextCallback_1t_2II)
+ (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
{
- PhCursorDef_t _arg1, *lparg1=NULL;
- NATIVE_ENTER(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhCursorDef_1t_2I\n")
- if (arg1) lparg1 = getPhCursorDef_tFields(env, arg1, &_arg1);
- memmove((void *)arg0, (const void *)lparg1, arg2);
- NATIVE_EXIT(env, that, "memmove__ILorg_eclipse_swt_internal_photon_PhCursorDef_1t_2I\n")
+ PtTextCallback_t _arg0, *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtTextCallback_1t_2II\n")
+ if (arg0) lparg0 = &_arg0;
+ memmove((void *)lparg0, (const void *)arg1, arg2);
+ if (arg0) setPtTextCallback_tFields(env, arg0, lparg0);
+ NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PtTextCallback_1t_2II\n")
}
#endif
-#ifndef NO_memmove__Lorg_eclipse_swt_internal_photon_PhClipHeader_2II
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_photon_PhClipHeader_2II)
- (JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+#ifndef NO_memmove___3BII
+JNIEXPORT void JNICALL OS_NATIVE(memmove___3BII)
+ (JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2)
{
- PhClipHeader _arg0, *lparg0=NULL;
- NATIVE_ENTER(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhClipHeader_2II\n")
- if (arg0) lparg0 = &_arg0;
- memmove((void *)lparg0, (const void *)arg1, arg2);
- if (arg0) setPhClipHeaderFields(env, arg0, lparg0);
- NATIVE_EXIT(env, that, "memmove__Lorg_eclipse_swt_internal_photon_PhClipHeader_2II\n")
+ jbyte *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove___3BII\n")
+ if (arg0) lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL);
+ memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
+ if (arg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
+ NATIVE_EXIT(env, that, "memmove___3BII\n")
}
#endif
@@ -3635,6 +3609,32 @@ JNIEXPORT void JNICALL OS_NATIVE(memmove___3BLorg_eclipse_swt_internal_photon_Ph
}
#endif
+#ifndef NO_memmove___3III
+JNIEXPORT void JNICALL OS_NATIVE(memmove___3III)
+ (JNIEnv *env, jclass that, jintArray arg0, jint arg1, jint arg2)
+{
+ jint *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove___3III\n")
+ if (arg0) lparg0 = (*env)->GetIntArrayElements(env, arg0, NULL);
+ memmove((void *)lparg0, (const void *)arg1, arg2);
+ if (arg0) (*env)->ReleaseIntArrayElements(env, arg0, lparg0, 0);
+ NATIVE_EXIT(env, that, "memmove___3III\n")
+}
+#endif
+
+#ifndef NO_memmove___3SII
+JNIEXPORT void JNICALL OS_NATIVE(memmove___3SII)
+ (JNIEnv *env, jclass that, jshortArray arg0, jint arg1, jint arg2)
+{
+ jshort *lparg0=NULL;
+ NATIVE_ENTER(env, that, "memmove___3SII\n")
+ if (arg0) lparg0 = (*env)->GetShortArrayElements(env, arg0, NULL);
+ memmove((void *)lparg0, (const void *)arg1, (size_t)arg2);
+ if (arg0) (*env)->ReleaseShortArrayElements(env, arg0, lparg0, 0);
+ NATIVE_EXIT(env, that, "memmove___3SII\n")
+}
+#endif
+
#ifndef NO_strdup
JNIEXPORT jint JNICALL OS_NATIVE(strdup)
(JNIEnv *env, jclass that, jint arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt_os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.h
index 31cc659f9e..31cc659f9e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt_os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os.h
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_custom.c
index 4246082236..d0606a77c5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/swt_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_custom.c
@@ -10,7 +10,7 @@
*******************************************************************************/
#include "swt.h"
-#include "structs.h"
+#include "os_structs.h"
#define OS_NATIVE(func) Java_org_eclipse_swt_internal_photon_OS_##func
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.c
index 4ea64fc827..9450a59624 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.c
@@ -10,7 +10,7 @@
*******************************************************************************/
#include "swt.h"
-#include "structs.h"
+#include "os_structs.h"
#ifndef NO_FontDetails
typedef struct FontDetails_FID_CACHE {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.h
index 250cdc6c0d..e19d9541fa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/photon/library/os_structs.h
@@ -9,7 +9,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
-#include "swt_os.h"
+#include "os.h"
#ifndef NO_FontDetails
FontDetails *getFontDetailsFields(JNIEnv *env, jobject lpObject, FontDetails *lpStruct);

Back to the top