x11proto-core: Changes to 'upstream-experimental'
.gitignore | 83 ++++++++++-
COPYING | 21 ++
DECkeysym.h | 2
HPkeysym.h | 1
Makefile.am | 12 -
README | 25 +++
Sunkeysym.h | 50 +++---
X.h | 5
XF86keysym.h | 6
XWDFile.h | 1
Xalloca.h | 31 ----
Xarch.h | 133 ++++++------------
Xdefs.h | 2
Xfuncproto.h.in | 10 -
Xfuncs.h | 81 +++--------
Xmd.h | 162 +++++++++-------------
Xos.h | 280 +++++++++------------------------------
Xos_r.h | 103 ++------------
Xosdefs.h | 182 ++++++++-----------------
Xpoll.h.in | 41 -----
Xproto.h | 4
Xprotostr.h | 1
Xthreads.h | 401 +++++++++++++++++++++++++++-----------------------------
Xw32defs.h | 140 +++++++++----------
Xwindows.h | 47 ++++--
Xwinsock.h | 9 -
configure.ac | 12 +
keysym.h | 3
keysymdef.h | 21 ++
29 files changed, 783 insertions(+), 1086 deletions(-)
New commits:
commit 9ffca704438993516016671e9a7f67c5ca21f142
Author: Julien Cristau <jcristau@debian.org>
Date: Sat May 15 17:43:32 2010 +0200
xproto 7.0.17
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/configure.ac b/configure.ac
index ec1b825..f45250e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.17], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 81c3cc1ce1f163de91d33bfa1b335f8b4d309c13
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:25:52 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index e885fa4..ec1b825 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT([Xproto], [7.0.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 1f442cdd1c26fa10e654ef2e957e24c2306abb11
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:00:31 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 98263f3..26b9995 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ nodist_xproto_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xproto.pc
-EXTRA_DIST = xproto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 1511eb6065c103149b7ce59b4cc0aa538449cf80
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Mar 27 19:42:59 2010 -0700
Add _X_NORETURN macro to signify functions that don't return
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
index afdd95b..96a585c 100644
--- a/Xfuncproto.h.in
+++ b/Xfuncproto.h.in
@@ -117,4 +117,10 @@ in this Software without prior written authorization from The Open Group.
# define _X_DEPRECATED
#endif
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
+# define _X_NORETURN __attribute((noreturn))
+#else
+# define _X_NORETURN
+#endif /* GNUC */
+
#endif /* _XFUNCPROTO_H_ */
commit e7d73aec46f2ebc21e8b80378c3647b69f098b9a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 27 16:38:27 2010 -0400
config: remove execute permission on configuration file
Introduced in commit c879dab58f82f4789f27933c22706c84015f8684
"avoid checking for fds_bits on mingw"
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644
commit bf25d06799da98c3df655d8a734fe98c98bf143e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 13:31:40 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/COPYING b/COPYING
index 1724bb2..e514d36 100644
--- a/COPYING
+++ b/COPYING
@@ -1,3 +1,24 @@
+Copyright © 1991 Sun Microsystems, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+
Copyright 1987, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/Sunkeysym.h b/Sunkeysym.h
index be1b21d..87e7f11 100644
--- a/Sunkeysym.h
+++ b/Sunkeysym.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright © 1991 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
/************************************************************
Copyright 1991, 1998 The Open Group
@@ -22,32 +44,6 @@ 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.
-
-Copyright 1991 by Sun Microsystems, Inc. Mountain View, CA.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright no-
-tice appear in all copies and that both that copyright no-
-tice and this permission notice appear in supporting docu-
-mentation, and that the name of Sun not be used in
-advertising or publicity pertaining to distribution of the
-software without specific prior written permission. Sun
-makes no representations about the suitability of this
-software for any purpose. It is provided "as is" without any
-express or implied warranty.
-
-SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT-
-NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI-
-ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
***********************************************************/
/*
commit d02f4b124489016f43478ac2ca2fbb2d0253ba02
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 13 16:51:14 2009 -0500
xproto: Cygwin GCC does not support visibility attributes
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
index 0843491..afdd95b 100644
--- a/Xfuncproto.h.in
+++ b/Xfuncproto.h.in
@@ -83,7 +83,7 @@ in this Software without prior written authorization from The Open Group.
# define _X_ATTRIBUTE_PRINTF(x,y)
#endif /* GNUC >= 4 */
-#if defined(__GNUC__) && (__GNUC__ >= 4)
+#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__)
# define _X_EXPORT __attribute__((visibility("default")))
# define _X_HIDDEN __attribute__((visibility("hidden")))
# define _X_INTERNAL __attribute__((visibility("internal")))
commit ec13f2cc5af936aafc3a483f441c44aa5ed14fe3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 22 19:24:48 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index eb7090b..98263f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,8 @@ pkgconfig_DATA = xproto.pc
EXTRA_DIST = xproto.pc.in
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
.PHONY: ChangeLog INSTALL
INSTALL:
commit 45135e80f1e1f8818159f7d80372a77df0537738
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 16 11:13:30 2009 -0500
README: file created or updated #24206
Contains a set of URLs to freedesktop.org.
diff --git a/README b/README
new file mode 100644
index 0000000..f310ce8
--- /dev/null
+++ b/README
@@ -0,0 +1,25 @@
+ X Window System Core Protocol
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/proto/x11proto
+
+ http://cgit.freedesktop.org/xorg/proto/x11proto
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit cdd22487f12f7058404759bd138ada421debc93a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 19:45:27 2009 -0500
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
diff --git a/Makefile.am b/Makefile.am
index e52cc14..eb7090b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,7 @@ nodist_xproto_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xproto.pc
-EXTRA_DIST = xproto.pc.in ChangeLog
-
-CLEANFILES=ChangeLog
+EXTRA_DIST = xproto.pc.in
.PHONY: ChangeLog INSTALL
commit b99b992915dd19914c9464d9a96278d2cc2ceeeb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 18:31:29 2009 -0500
Makefile.am: INSTALL file is missing or incorrect #24206
The standard GNU file on building/installing tarball is copied
using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
Add INSTALL target
diff --git a/Makefile.am b/Makefile.am
index 96c6b26..e52cc14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,10 +36,13 @@ EXTRA_DIST = xproto.pc.in ChangeLog
CLEANFILES=ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
commit caea0fd5a966a74465d965ecab89f4829dced157
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 18:11:36 2009 -0500
configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
diff --git a/configure.ac b/configure.ac
index bd9b86f..e885fa4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3,13 +3,15 @@ AC_INIT([Xproto], [7.0.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
AC_CONFIG_HEADER([do-not-use-config.h])
AC_CONFIG_HEADER([Xfuncproto.h])
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-
AC_CANONICAL_HOST
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
@@ -201,8 +203,6 @@ if test "x$WIDEPROTO" = xno; then
AC_DEFINE(NARROWPROTO, [], [Narrow prototypes])
fi
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile
Xpoll.h
commit f1b1d45cd955f24a338af098ebd6a181b1454b38
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Nov 14 20:47:09 2009 -0500
configure.ac: AM_MAINTAINER_MODE missing #24238
This turns off maintainer mode build rules in tarballs.
Works in conjunction with autogen.sh --enable-maintainer-mode
diff --git a/configure.ac b/configure.ac
index a0b44ec..bd9b86f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
AC_PREREQ([2.57])
AC_INIT([Xproto], [7.0.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
AC_CONFIG_HEADER([do-not-use-config.h])
AC_CONFIG_HEADER([Xfuncproto.h])
commit 78947b5a7e0ef934fdce7e1bce734d2cf29639b4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Nov 14 18:26:47 2009 -0500
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index 3bcd1e2..70368c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,82 @@
-Makefile
-Makefile.in
-Xpoll.h
-Xfuncproto.h
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
config.guess
+config.h
+config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
config.sub
configure
-do-not-use-config.h
-do-not-use-config.h.in
+configure.scan
+depcomp
+.deps/
+INSTALL
install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
-stamp-h1
-stamp-h2
-xproto.pc
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-xproto-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for x11proto
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
+Xfuncproto.h
+Xpoll.h
+do-not-use-config.h
+do-not-use-config.h.in
commit 3ec82cd722407e4dccd6165786d3452f3ab80bea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 10:46:06 2009 +1000
Add XF86XK_TouchpadToggle
Many laptops provide a key to enable or disable the touchpad and the
trackstick. On Lenovo T61s, this key is located on Fn + F8.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/XF86keysym.h b/XF86keysym.h
index 96eefdb..200f5c1 100644
--- a/XF86keysym.h
+++ b/XF86keysym.h
@@ -206,6 +206,7 @@
#define XF86XK_Suspend 0x1008FFA7 /* Sleep to RAM */
#define XF86XK_Hibernate 0x1008FFA8 /* Sleep to disk */
+#define XF86XK_TouchpadToggle 0x1008FFA9 /* Toggle between touchpad/trackstick */
/* Keys for special action keys (hot keys) */
/* Virtual terminals on some operating systems */
commit 4253e208088d166a8666f673360ef69a3c86f8b0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Sep 23 17:04:09 2009 -0700
xproto 7.0.16
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index eff39c3..a0b44ec 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.15], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER([do-not-use-config.h])
commit 05914c82696432126a72845dd061c7f5e24963c5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Sep 23 17:00:18 2009 -0700
Don't need an #ifdef when both cases just include the same file
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Xpoll.h.in b/Xpoll.h.in
index 643c2e1..8275658 100644
--- a/Xpoll.h.in
+++ b/Xpoll.h.in
@@ -56,14 +56,7 @@ from The Open Group.
#include <X11/Xos.h>
-/* Below is the monster branch from hell. Basically, most systems will drop to
- * 'the branch below is the fallthrough for halfway modern systems', and include
- * <sys/select.h>, so we get the FD_* macros. */
-# if defined(SVR4) && !defined(FD_SETSIZE)
-# include <sys/select.h>
-# else /* not SVR4/CRAY/AIXv3 */
-# include <sys/select.h>
-# endif
+#include <sys/select.h> /* Get the FD_* macros. */
#include <X11/Xmd.h>
commit ef37625372546efb32cdb37823b9927cf16b0840
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jun 17 15:28:54 2009 +0100
Restore macro definition of sleep(), needed by Xming
Removed in error by commit 1defe6b37c23941fe2a67ad4fa66e8ab5f37f9b3
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
diff --git a/Xwindows.h b/Xwindows.h
index 149580e..6318155 100644
--- a/Xwindows.h
+++ b/Xwindows.h
@@ -75,6 +75,10 @@ The Open Group.
# define RT_CURSOR ((RESTYPE)5)
#endif
+#ifndef __CYGWIN__
+#define sleep(x) Sleep((x) * 1000)
+#endif
+
#if defined(WIN32) && (!defined(PATH_MAX) || PATH_MAX < 1024)
# undef PATH_MAX
# define PATH_MAX 1024
commit e9df99b12ef9fefdbc1c05ff51bddffe723051e9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sun Jun 14 09:54:58 2009 -0700
Drop #ifdef USG checks for some truly ancient (pre-SVR4) SysV's
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Xos.h b/Xos.h
index e16f473..646716b 100644
--- a/Xos.h
+++ b/Xos.h
@@ -39,14 +39,7 @@ in this Software without prior written authorization from The Open Group.
* Get major data types (esp. caddr_t)
*/
-# ifdef USG
-# ifndef __TYPES__
-# include <sys/types.h> /* forgot to protect it... */
-# define __TYPES__
-# endif /* __TYPES__ */
-# else /* USG */
-# include <sys/types.h>
-# endif /* USG */
+# include <sys/types.h>
# if defined(__SCO__) || defined(__UNIXWARE__)
# include <stdint.h>
@@ -100,56 +93,32 @@ in this Software without prior written authorization from The Open Group.
* Get struct timeval and struct tm
*/
-# if defined(SYSV)
-
-# ifndef USL
-# include <sys/time.h>
-# endif
-# include <time.h>
-# if defined(USG)
-struct timeval {
- long tv_sec;
- long tv_usec;
-};
-# ifndef USL_SHARELIB
-struct timezone {
- int tz_minuteswest;
- int tz_dsttime;
-};
-# endif /* USL_SHARELIB */
-# endif /* USG */
-
-
-# else /* not SYSV */
-
-# if defined(_POSIX_SOURCE) && defined(SVR4)
+# if defined(_POSIX_SOURCE) && defined(SVR4)
/* need to omit _POSIX_SOURCE in order to get what we want in SVR4 */
-# undef _POSIX_SOURCE
-# include <sys/time.h>
-# define _POSIX_SOURCE
-# elif defined(WIN32)
-# include <time.h>
-# if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
+# undef _POSIX_SOURCE
+# include <sys/time.h>
+# define _POSIX_SOURCE
+# elif defined(WIN32)
+# include <time.h>
+# if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL)
struct timeval {
long tv_sec; /* seconds */
long tv_usec; /* and microseconds */
};
-# define _TIMEVAL_DEFINED
-# endif
-# include <sys/timeb.h>
-# define gettimeofday(t) \
+# define _TIMEVAL_DEFINED
+# endif
+# include <sys/timeb.h>
+# define gettimeofday(t) \
{ \
struct _timeb _gtodtmp; \
_ftime (&_gtodtmp); \
(t)->tv_sec = _gtodtmp.time; \
(t)->tv_usec = _gtodtmp.millitm * 1000; \
}
-# else
-# include <sys/time.h>
-# include <time.h>
-# endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
-
-# endif /* SYSV */
+# else
+# include <sys/time.h>
+# include <time.h>
+# endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
/* define X_GETTIMEOFDAY macro, a portable gettimeofday() */
# if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */
diff --git a/Xos_r.h b/Xos_r.h
index 96e14cd..f963b64 100644
--- a/Xos_r.h
+++ b/Xos_r.h
@@ -535,7 +535,7 @@ typedef int _Xgetservbynameparams; /* dummy */
#if defined(X_INCLUDE_DIRENT_H) && !defined(_XOS_INCLUDED_DIRENT_H)
# include <sys/types.h>
-# if !defined(X_NOT_POSIX) || defined(SYSV) || defined(USG)
+# if !defined(X_NOT_POSIX) || defined(SYSV)
# include <dirent.h>
# else
# include <sys/dir.h>
commit 385c1343f7e0782b89e40fa17e378bc1f75ce62e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sun Jun 14 09:43:53 2009 -0700
Get rid of unneeded && clause in list of LP64 ifdefs in Xmd.h
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Xmd.h b/Xmd.h
index bc14787..f3868b3 100644
--- a/Xmd.h
+++ b/Xmd.h
@@ -57,12 +57,11 @@ SOFTWARE.
# include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
# endif
-# if defined (_LP64) || \
+# if defined (_LP64) || defined(__LP64__) || \
defined(__alpha) || defined(__alpha__) || \
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \
- defined(__hppa__) && defined(__LP64__) || \
defined(__amd64__) || defined(amd64) || \
defined(__powerpc64__)
# define LONG64 /* 32/64-bit architecture */
commit 5aaec3c7a583354a07ec765327fd0edd6216981f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sun Jun 14 09:33:16 2009 -0700
Drop support for SunOS 4 and Solaris releases older than 2.5 (1995)
Includes changing remaining sun ifdef's to check for standard-conformant /
non-namespace-polluting #ifdef __sun instead of older #ifdef sun.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/Xalloca.h b/Xalloca.h
index 02d8e11..1919884 100644
--- a/Xalloca.h
+++ b/Xalloca.h
@@ -88,7 +88,7 @@ from The Open Group.
* Test is easy, the new one is named __builtin_alloca and comes
* from alloca.h which #defines alloca.
*/
-# if defined(sun) || defined(alloca)
+# if defined(__sun) || defined(alloca)
/*
* Some System V boxes extract alloca.o from /lib/libPW.a; if you
* decide that you don't want to use alloca, you might want to fix it here.
diff --git a/Xarch.h b/Xarch.h
index 3548105..58fb9a5 100644
--- a/Xarch.h
+++ b/Xarch.h
@@ -39,10 +39,8 @@
# else
-# ifdef SVR4
-# if !defined(sun)
-# include <sys/byteorder.h>
-# endif
+# if defined(SVR4) || defined(__SVR4)
+# include <sys/byteorder.h>
# elif defined(CSRG_BASED)
# if defined(__NetBSD__) || defined(__OpenBSD__)
# include <sys/types.h>
@@ -75,7 +73,7 @@
# define LITTLE_ENDIAN 1234
# define BIG_ENDIAN 4321
-# if defined(sun) && defined(SVR4)
+# if defined(__sun) && defined(__SVR4)
# include <sys/isa_defs.h>
# ifdef _LITTLE_ENDIAN
# define BYTE_ORDER LITTLE_ENDIAN
diff --git a/Xfuncs.h b/Xfuncs.h
index 1dead0c..354b663 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -37,53 +37,28 @@ void bcopy();
void bzero();
int bcmp();
# else
-# if defined(SYSV) && !defined(__SCO__) && !defined(sun) && !defined(__UNIXWARE__)
+# if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__)
# include <memory.h>
void bcopy();
# define bzero(b,len) memset(b, 0, len)
# define bcmp(b1,b2,len) memcmp(b1, b2, len)
# else
# include <string.h>
-# if defined(__SCO__) || defined(sun) || defined(__UNIXWARE__)
+# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__)
# include <strings.h>
# endif
# define _XFUNCS_H_INCLUDED_STRING_H
-# if defined(sun)
-# define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
-# define bzero(b,len) memset(b, 0, (size_t)(len))
-# define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
-# endif
# endif
# endif /* X_USEBFUNCS */
/* the new Xfuncs.h */
-# if (!defined(sun) || defined(SVR4))
/* the ANSI C way */
-# ifndef _XFUNCS_H_INCLUDED_STRING_H
-# include <string.h>
-# endif
-# undef bzero
-# define bzero(b,len) memset(b,0,len)
-# else
-# if defined(SYSV) || defined(sun)
-# include <memory.h>
-# define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-# if defined(SYSV) && defined(_XBCOPYFUNC)
-# undef memmove
-# define memmove(dst,src,len) _XBCOPYFUNC((char *)(src),(char *)(dst),(int)(len))
-# define _XNEEDBCOPYFUNC
-# endif
-# else /* else vanilla BSD */
-# define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-# define memcpy(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len))
-# define memcmp(b1,b2,len) bcmp((char *)(b1),(char *)(b2),(int)(len))
-# endif /* SYSV else */
-# endif
-
-# if (defined(sun) && !defined(SVR4))
-# define atexit(f) on_exit(f, 0)
+# ifndef _XFUNCS_H_INCLUDED_STRING_H
+# include <string.h>
# endif
+# undef bzero
+# define bzero(b,len) memset(b,0,len)
# if defined WIN32 && defined __MINGW32__
# define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
diff --git a/Xmd.h b/Xmd.h
index 3975c01..bc14787 100644
--- a/Xmd.h
+++ b/Xmd.h
@@ -53,7 +53,7 @@ SOFTWARE.
/*
* Special per-machine configuration flags.
*/
-# if defined(sun) && defined(__SVR4)
+# if defined(__sun) && defined(__SVR4)
# include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
# endif
diff --git a/Xos.h b/Xos.h
index a07e5e2..e16f473 100644
--- a/Xos.h
+++ b/Xos.h
@@ -67,12 +67,9 @@ in this Software without prior written authorization from The Open Group.
*/
# include <string.h>
-# if defined(__SCO__) || defined(__UNIXWARE__)
+# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun)
# include <strings.h>
# else
-# if (defined(sun) && defined(__SVR4))
-# include <strings.h>
-# endif
# ifndef index
# define index(s,c) (strchr((s),(c)))
# endif
@@ -82,18 +79,6 @@ in this Software without prior written authorization from The Open Group.
# endif
/*
- * strerror()
- */
-# if (defined(sun) && !defined(SVR4)) && !defined(__GLIBC__)
-# ifndef strerror
-extern char *sys_errlist[];
-extern int sys_nerr;
-# define strerror(n) \
- (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error")
-# endif
-# endif
-
-/*
* Get open(2) constants
*/
# if defined(X_NOT_POSIX)
@@ -170,7 +155,7 @@ struct timeval {
# if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */
# define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
# else
-# if defined(SVR4) || defined(WIN32)
+# if defined(SVR4) || defined(__SVR4) || defined(WIN32)
# define X_GETTIMEOFDAY(t) gettimeofday(t)
# else
# define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0)
diff --git a/Xos_r.h b/Xos_r.h
index 32997f7..96e14cd 100644
--- a/Xos_r.h
+++ b/Xos_r.h
@@ -192,7 +192,7 @@ extern void XtProcessUnlock(
* uses the older SVR4 thread-safe functions unless the POSIX ones
* are specifically requested. Fix the feature test macro.
*/
-#if defined(sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \
+#if defined(__sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \
(_POSIX_C_SOURCE - 0 < 199506L) && !defined(_POSIX_PTHREAD_SEMANTICS)
# undef _POSIX_THREAD_SAFE_FUNCTIONS
#endif
@@ -915,7 +915,7 @@ typedef struct tm _Xltimeparams;
# define _XGmtime(t,p) (gmtime_r((t),&(p)) ? NULL : &(p))
# define _XLocaltime(t,p) (localtime_r((t),&(p)) ? NULL : &(p))
-#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(sun)
+#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(__sun)
/* Returns NULL on failure. Solaris 2.5
*
* extern char *asctime_r(const struct tm *tm,char *buf, int buflen);
@@ -1038,7 +1038,7 @@ typedef struct {
(_Xos_processUnlock), \
(p).pgrp )
Reply to: