mirror of
https://github.com/gnustep/libs-back.git
synced 2025-02-23 11:51:27 +00:00
Avoid spurious warnings produced by gcc-4.1
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@23127 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
e476dec35c
commit
940a0eabbe
7 changed files with 180 additions and 161 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2006-07-04 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/art/ftfont.m:
|
||||
* Source/x11/XGServer.m:
|
||||
* Source/x11/XGDragView.m:
|
||||
* Source/GSBackend.m:
|
||||
* Source/gsc/GSGState.m:
|
||||
* Tools/gpbs.m:
|
||||
Avoid spurious warnings produced by gcc-4.1
|
||||
|
||||
2006-06-22 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Tools/gpbs.m: Fix to get profiling to work for this daemon
|
||||
|
|
|
@ -36,8 +36,14 @@
|
|||
|
||||
#if BUILD_SERVER == SERVER_x11
|
||||
#include <x11/XGServer.h>
|
||||
@interface XGServer (Initialize)
|
||||
+ (void) initializeBackend;
|
||||
@end
|
||||
#elif BUILD_SERVER == SERVER_win32
|
||||
#include <win32/WIN32Server.h>
|
||||
@interface WIN32Server (Initialize)
|
||||
+ (void) initializeBackend;
|
||||
@end
|
||||
#endif
|
||||
|
||||
/* Call the correct initalization routines for the choosen
|
||||
|
|
|
@ -179,6 +179,7 @@ static NSMutableSet *families_seen, *families_pending;
|
|||
- (void) dealloc
|
||||
{
|
||||
NSLog(@"Warning: -dealloc called on %@",self);
|
||||
GSNOSUPERDEALLOC;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
@ -416,8 +416,8 @@ typedef enum {
|
|||
*/
|
||||
uch = NULL;
|
||||
ulen = 0;
|
||||
GSToUnicode(&uch, &ulen, s, strlen(s), [font mostCompatibleStringEncoding],
|
||||
NSDefaultMallocZone(), 0);
|
||||
GSToUnicode(&uch, &ulen, (const unsigned char*)s, strlen(s),
|
||||
[font mostCompatibleStringEncoding], NSDefaultMallocZone(), 0);
|
||||
|
||||
for (i = 0; i < ulen; i++)
|
||||
{
|
||||
|
|
|
@ -155,7 +155,7 @@ mimeTypeForPasteboardType(Display *xDisplay, NSZone *zone, NSArray *types)
|
|||
|
||||
static XGDragView *sharedDragView = nil;
|
||||
|
||||
+ (XGDragView*) sharedDragView
|
||||
+ (id) sharedDragView
|
||||
{
|
||||
if (sharedDragView == nil)
|
||||
{
|
||||
|
|
|
@ -596,12 +596,14 @@ _parse_display_name(NSString *name, int *dn, int *sn)
|
|||
@implementation XGServer (InputMethod)
|
||||
- (NSString *) inputMethodStyle
|
||||
{
|
||||
return inputServer ? [(XIMInputServer *)inputServer inputMethodStyle] : nil;
|
||||
return inputServer ? [(XIMInputServer *)inputServer inputMethodStyle]
|
||||
: (NSString*)nil;
|
||||
}
|
||||
|
||||
- (NSString *) fontSize: (int *)size
|
||||
{
|
||||
return inputServer ? [(XIMInputServer *)inputServer fontSize: size] : nil;
|
||||
return inputServer ? [(XIMInputServer *)inputServer fontSize: size]
|
||||
: (NSString*)nil;
|
||||
}
|
||||
|
||||
- (BOOL) clientWindowRect: (NSRect *)rect
|
||||
|
|
|
@ -220,7 +220,7 @@ NSMutableDictionary *pasteboards = nil;
|
|||
{
|
||||
if (verbose)
|
||||
{
|
||||
NSLog(@"get data for %x\n", (unsigned)self);
|
||||
NSLog(@"get data for %p\n", self);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
@ -269,7 +269,7 @@ NSMutableDictionary *pasteboards = nil;
|
|||
{
|
||||
if (verbose)
|
||||
{
|
||||
NSLog(@"set data for %x\n", (unsigned)self);
|
||||
NSLog(@"set data for %p\n", self);
|
||||
}
|
||||
ASSIGN(data, d);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue