86079

5 files changed, 18 insertions, 3 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c
index 1f156b9613..6ab3938c45 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os.c
@@ -5245,6 +5245,18 @@ fail:
 }
 #endif
 
+#ifndef NO_localeconv_1decimal_1point
+JNIEXPORT jint JNICALL OS_NATIVE(localeconv_1decimal_1point)
+	(JNIEnv *env, jclass that)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, localeconv_1decimal_1point_FUNC);
+	rc = (jint)localeconv_decimal_point();
+	OS_NATIVE_EXIT(env, that, localeconv_1decimal_1point_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_memmove__ILorg_eclipse_swt_internal_motif_XButtonEvent_2I
 JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_motif_XButtonEvent_2I)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_custom.h
index b37e27482c..962a288e71 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_custom.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_custom.h
@@ -11,4 +11,4 @@
  
 /* Special sizeof's */
 #define fd_set_sizeof() sizeof(fd_set)
-
+#define localeconv_decimal_point() localeconv()->decimal_point
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.c
index 4b4539539e..3633db0cc7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.c
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 446;
-int OS_nativeFunctionCallCount[446];
+int OS_nativeFunctionCount = 447;
+int OS_nativeFunctionCallCount[447];
 char * OS_nativeFunctionNames[] = {
 	"CODESET",
 	"FD_1ISSET",
@@ -410,6 +410,7 @@ char * OS_nativeFunctionNames[] = {
 	"iconv",
 	"iconv_1close",
 	"iconv_1open",
+	"localeconv_1decimal_1point",
 	"memmove__ILorg_eclipse_swt_internal_motif_XButtonEvent_2I",
 	"memmove__ILorg_eclipse_swt_internal_motif_XClientMessageEvent_2I",
 	"memmove__ILorg_eclipse_swt_internal_motif_XConfigureEvent_2I",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.h
index a4b803e729..ea564ab99c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/library/os_stats.h
@@ -414,6 +414,7 @@ typedef enum {
 	iconv_FUNC,
 	iconv_1close_FUNC,
 	iconv_1open_FUNC,
+	localeconv_1decimal_1point_FUNC,
 	memmove__ILorg_eclipse_swt_internal_motif_XButtonEvent_2I_FUNC,
 	memmove__ILorg_eclipse_swt_internal_motif_XClientMessageEvent_2I_FUNC,
 	memmove__ILorg_eclipse_swt_internal_motif_XConfigureEvent_2I_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
index 9813240007..36bfb31e67 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/motif/OS.java
@@ -4058,6 +4058,7 @@ public static final native int getenv(byte[] name);
 public static final native int iconv(int cd, int[] inBuf, int[] inBytesLeft, int[] outBuf, int[] outBytesLeft);
 public static final native int iconv_close(int cd);
 public static final native int iconv_open(byte[] tocode, byte[] fromcode);
+public static final native int localeconv_decimal_point();
 public static final native void memmove(int dest, XImage src, int count);
 public static final native void memmove(int dest, XmDragProcCallbackStruct src, int count);
 public static final native void memmove(int dest, XmSpinBoxCallbackStruct src, int count);