2011-08-28 Christopher Armstrong <carmstrong@fastmail.com.au>

* Source/GSHorizontalTypesetter.m: Split declaration of struct
	GSHorizontalTypesetter_glyph_cache_s and struct
	GSHorizontalTypesetter_line_frag_s from their typedefs to compile
	under clang.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33793 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Christopher Armstrong 2011-08-28 09:25:02 +00:00
parent 5554634f9c
commit 42162c4e22
2 changed files with 12 additions and 6 deletions

View file

@ -1,3 +1,9 @@
2011-08-28 Christopher Armstrong <carmstrong@fastmail.com.au>
* Source/GSHorizontalTypesetter.m: Split declaration of struct
GSHorizontalTypesetter_glyph_cache_s and struct
GSHorizontalTypesetter_line_frag_s from their typedefs to compile
under clang.
2011-08-26 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSImage.m ( _loadFromFile): Correct last commit.

View file

@ -99,7 +99,7 @@ cache fairly aggressively without having to worry about memory consumption.
#define CACHE_STEP 192
typedef struct GSHorizontalTypesetter_glyph_cache_s
struct GSHorizontalTypesetter_glyph_cache_s
{
/* These fields are filled in by the caching: */
NSGlyph g;
@ -119,8 +119,8 @@ typedef struct GSHorizontalTypesetter_glyph_cache_s
NSPoint pos; /* relative to the line's baseline */
NSSize size; /* height is used only for attachments */
BOOL dont_show, outside_line_frag;
} glyph_cache_t;
};
typedef struct GSHorizontalTypesetter_glyph_cache_s glyph_cache_t;
/* TODO: if we could know whether the layout manager had been modified since
the last time or not, we wouldn't need to clear the cache every time */
@ -312,13 +312,13 @@ including gi will have been cached.
}
typedef struct GSHorizontalTypesetter_line_frag_s
struct GSHorizontalTypesetter_line_frag_s
{
NSRect rect;
float last_used;
unsigned int last_glyph; /* last_glyph+1, actually */
} line_frag_t;
};
typedef struct GSHorizontalTypesetter_line_frag_s line_frag_t;
-(void) fullJustifyLine: (line_frag_t *)lf : (int)num_line_frags
{