Merge branch '3.6.x'

1 files changed, 38 insertions, 0 deletions

diff --git a/nx-X11/lib/include/X11/Xlocale.h b/nx-X11/lib/include/X11/Xlocale.h
new file mode 100644
index 000000000..4ac9bac30
--- /dev/null
+++ b/nx-X11/lib/include/X11/Xlocale.h
@@ -0,0 +1,38 @@
+/*
+
+Copyright 1991, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+*/
+
+#if !defined(_X11_XLOCALE_H_) && !defined(_XLOCALE_H_)
+#define _X11_XLOCALE_H_
+#define _XLOCALE_H_
+
+#include <nx-X11/Xfuncproto.h>
+#include <nx-X11/Xosdefs.h>
+
+#include <locale.h>
+
+#endif /* !defined(_X11_XLOCALE_H_) && !defined(_XLOCALE_H_) */