diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-11-07 23:09:36 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2009-11-07 23:09:36 +0000 |
| commit | c413f6dff0489273d60e1e63e1f14616ebd7534e (patch) | |
| tree | e81713ca7d95146ffcf69ffef5a061493f495913 | |
| parent | 3284e15f2c55c7428a5339a0cba6c5ee42c76768 (diff) | |
remove gcc 1 workaround we no longer care about which
was breaking non GNUC defining compilers.
Came up during a conversation with ragge@, positive
comments from several.
| -rw-r--r-- | lib/libc/quad/quad.h | 12 | ||||
| -rw-r--r-- | sys/lib/libkern/quad.h | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h index 778b5ccb465..168a1264ac6 100644 --- a/lib/libc/quad/quad.h +++ b/lib/libc/quad/quad.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: quad.h,v 1.6 2004/11/28 07:09:13 mickey Exp $ + * $OpenBSD: quad.h,v 1.7 2009/11/07 23:09:35 jsg Exp $ */ /* @@ -95,17 +95,7 @@ union uu { #define LHALF(x) ((u_int)(x) & (((int)1 << HALF_BITS) - 1)) #define LHUP(x) ((u_int)(x) << HALF_BITS) -/* - * XXX - * Compensate for gcc 1 vs gcc 2. Gcc 1 defines ?sh?di3's second argument - * as u_quad_t, while gcc 2 correctly uses int. Unfortunately, we still use - * both compilers. - */ -#if __GNUC_PREREQ__(2, 0) || defined(lint) typedef unsigned int qshift_t; -#else -typedef u_quad_t qshift_t; -#endif quad_t __adddi3(quad_t, quad_t); quad_t __anddi3(quad_t, quad_t); diff --git a/sys/lib/libkern/quad.h b/sys/lib/libkern/quad.h index e26b5dfca3f..a77d05139ed 100644 --- a/sys/lib/libkern/quad.h +++ b/sys/lib/libkern/quad.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: quad.h,v 1.10 2008/02/25 21:21:58 deraadt Exp $ + * $OpenBSD: quad.h,v 1.11 2009/11/07 23:09:35 jsg Exp $ */ /* @@ -95,17 +95,7 @@ union uu { #define LHALF(x) ((u_int)(x) & (((int)1 << HALF_BITS) - 1)) #define LHUP(x) ((u_int)(x) << HALF_BITS) -/* - * XXX - * Compensate for gcc 1 vs gcc 2. Gcc 1 defines ?sh?di3's second argument - * as u_quad_t, while gcc 2 correctly uses int. Unfortunately, we still use - * both compilers. - */ -#if __GNUC_PREREQ__(2, 0) || defined(lint) typedef unsigned int qshift_t; -#else -typedef u_quad_t qshift_t; -#endif quad_t __adddi3(quad_t, quad_t); quad_t __anddi3(quad_t, quad_t); |