Various GNUstep port compilation fixes. Some more unsigned-signed comparison fixes for the SDL ports. Replaced bcopy with memmove in GuiDisplayGen.m setTabStops method for maximum portability (MinGW/GCC 3.4.2 does not contain the bcopy function in string.h).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1070 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Nikos Barkas 2007-07-09 18:01:48 +00:00
parent 949cd8da04
commit d17d06337c
7 changed files with 14 additions and 7 deletions

View File

@ -32,7 +32,7 @@ MA 02110-1301, USA.
{
GuiDisplayGen *gui=[UNIVERSE gui];
NSArray *stickList=[stickHandler listSticks];
int i;
unsigned i;
int tabStop[GUI_MAX_COLUMNS];
tabStop[0]=50;
tabStop[1]=210;
@ -173,7 +173,7 @@ MA 02110-1301, USA.
- (void) displayFunctionList: (GuiDisplayGen *)gui
{
int i;
unsigned i;
[gui setColor: [OOColor greenColor] forRow: HEADINGROW];
[gui setArray: [NSArray arrayWithObjects:
@"Function", @"Assigned to", @"Type", nil]

View File

@ -493,7 +493,7 @@ OOINLINE BOOL RowInRange(OOGUIRow row, NSRange range)
- (void) setTabStops:(OOGUITabSettings)stops
{
if (stops != NULL) bcopy(stops, tabStops, sizeof tabStops);
if (stops != NULL) memmove(tabStops, stops, sizeof tabStops);
}

View File

@ -60,6 +60,11 @@ SOFTWARE.
#import <Foundation/Foundation.h>
#import "OOFunctionAttributes.h"
#ifdef GNUSTEP
#include <limits.h>
#endif
@interface NSArray (OOExtractor)

View File

@ -149,7 +149,7 @@ OOINLINE void OOLogOutputHandlerInit(void) {}
OOINLINE OOLogOutputHandlerClose(void) {}
OOINLINE void OOLogOutputHandlerPrint(NSString *string)
OOINLINE void OOLogOutputHandlerPrint(NSString *inString)
{
NSLog(@"%@", inString);
}

View File

@ -478,7 +478,7 @@ MA 02110-1301, USA.
- (void)loadStickSettings
{
int i;
unsigned i;
[self clearMappings];
NSUserDefaults *defaults=[NSUserDefaults standardUserDefaults];
NSDictionary *axisSettings=[defaults objectForKey: AXIS_SETTINGS];

View File

@ -120,7 +120,7 @@ extern int debug;
// Full screen sizes
NSMutableArray *screenSizes;
int currentSize;
unsigned currentSize;
BOOL fullScreen;
// Windowed mode

View File

@ -1178,7 +1178,9 @@ MA 02110-1301, USA.
- (int) loadFullscreenSettings
{
currentSize=0;
int width=0, height=0, refresh=0, i;
int width=0, height=0, refresh=0;
unsigned i;
NSArray* cmdline_arguments = [[NSProcessInfo processInfo] arguments];
NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];