Date: Sat, 19 Oct 2002 18:50:03 -0700 (PDT) From: "Steven G. Kargl" <kargl@troutmask.apl.washington.edu> To: freebsd-ports@FreeBSD.org Subject: Re: ports/44291: Fix build of x11-toolkits/plib on -current Message-ID: <200210200150.g9K1o39U018169@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/44291; it has been noted by GNATS.
From: "Steven G. Kargl" <kargl@troutmask.apl.washington.edu>
To: Kris Kennaway <kris@obsecurity.org>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/44291: Fix build of x11-toolkits/plib on -current
Date: Sat, 19 Oct 2002 18:45:05 -0700 (PDT)
Kris Kennaway said:
> On Sat, Oct 19, 2002 at 05:04:19PM -0700, Steven G. Kargl wrote:
>
> > --- src/js/js.h.orig Sat Oct 19 16:41:00 2002
> > +++ src/js/js.h Sat Oct 19 16:49:23 2002
> > @@ -63,7 +63,11 @@
> > # include <fcntl.h>
> >
> > # if defined(__FreeBSD__) || defined(__NetBSD__)
> > -# include <machine/joystick.h>
> > +# if __FreeBSD_version >= 500000
> > +# include <sys/joystick.h>
> > +# elif
> > +# include <machine/joystick.h>
> > +# endif
>
> You don't have to worry about the elif case here because
> <sys/joystick.h> exists in 4.x too (machine/joystick.h is a symlink)
>
This replaces patch-src::js::js.h.
--- src/js/js.h.orig Sat Oct 19 18:30:58 2002
+++ src/js/js.h Sat Oct 19 18:32:49 2002
@@ -62,7 +62,11 @@
# include <unistd.h>
# include <fcntl.h>
-# if defined(__FreeBSD__) || defined(__NetBSD__)
+# if defined(__FreeBSD__)
+# include <sys/joystick.h>
+# define JS_DATA_TYPE joystick
+# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
+# elif defined(__NetBSD__)
# include <machine/joystick.h>
# define JS_DATA_TYPE joystick
# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
@@ -132,9 +136,9 @@
-/*#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
int id ;
-#endif*/
+#endif
#ifdef WIN32
JOYINFOEX js ;
UINT js_id ;
--
Steve
http://troutmask.apl.washington.edu/~kargl/
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210200150.g9K1o39U018169>