The change in js/jsMacOSX.cxx confused me since I wouldn't expect it to have worked (it was taking the address of a value that was cast to a pointer, rather than casting the address of a value). The diff is against CVS, show lists the other changes that were needed.
The change to simgear/metar/Local.h is required because of the change in BSD for Panther (strnstr is now present). The moving of the #include of <string.h> was an earlier attempt.
The change to simgear/scene/material/matlib.cxx is due to a compiler bug. I need to have the print statement there in order to not have the error that I reported earlier. The typecast was an earlier attempt to work around the problem (and the typecast should be to an unsigned char anyway). THIS IS ONLY NEEDED BY THOSE PEOPLE USING PANTHER (or perhaps gcc 3.3 under Jaguar). I haven't done much investigation into the minimum amount, and type, of code needed to make that routine happy.
Finally, the change to simgear/screen/extensions.hxx cropped up when I did a clean build (after getting the new machine).
Jonathan Polley
===================================================================
RCS file: /cvsroot/plib/plib/src/js/jsMacOSX.cxx,v
retrieving revision 1.1
diff -r1.1 jsMacOSX.cxx
17c17
< int jsJoystick::kNumDevices = 32 ;
---
>
19c19
< io_object_t jsJoystick::ioDevices[kNumDevices];
---
> io_object_t* jsJoystick::ioDevices = NULL;
46a47,52
> if (!properties) {
> ulSetError(UL_WARNING, "failed to get properties for JS device");
> setError();
> return;
> }
>
77a84,88
> // count them and allocate storage
> while (IOIteratorNext(hidIterator)) ++numDevices;
> ioDevices = new io_object_t[numDevices];
> IOIteratorReset(hidIterator);
>
79a91
> int index = 0;
93,94c105,108
< ((usage == kHIDUsage_GD_Keyboard) || (usage == kHIDUsage_GD_Mouse))
< )
---
> ((usage == kHIDUsage_GD_Keyboard) || (usage == kHIDUsage_GD_Mouse))) {
> // we need to drop the numDevices count back down, since we included
> // these when allocating storage above.
> --numDevices;
96c110
<
---
> }
98c112
< ioDevices[numDevices++] = ioDev;
---
> ioDevices[index++] = ioDev;
127c141
< CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), &(LPVOID) hidDev);
---
> CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID), (LPVOID) &hidDev);
314a329
>
===================================================================
RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/metar/Local.h,v
retrieving revision 1.2
diff -r1.2 Local.h
22a23
> #include <string.h>
36d36
< #include <string.h>
1110c1110
< #ifndef __FreeBSD__ // strnstr is already defined on FreeBSD
---
> #if !defined (__FreeBSD__) && !defined (__APPLE__) // strnstr is already defined on FreeBSD
===================================================================
RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/scene/material/matlib.cxx,v
retrieving revision 1.8
diff -r1.8 matlib.cxx
53a54,55
> #include <stdio.h>
>
185a188
> printf ("j=%d\n",j);
207c210
< env_map[i][j][3] = (int)(bright * 255);
---
> env_map[i][j][3] = (unsigned char)(bright * 255);
=================================================================== RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/screen/extensions.hxx,v retrieving revision 1.9 diff -r1.9 extensions.hxx 29c29 < #else --- > #elif !defined(__APPLE__)
_______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
