gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 07:21:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Protect the name id.

Browse source 
Patch by Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@33065 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2011-05-19 07:37:29 +00:00
parent 6c0d48eeec
commit 1bdcc0b82d
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,11 @@
2011-05-19 Fred Kiefer <FredKiefer@gmx.de>
* Headers/cairo/CairoFontEnumerator.h,
* Headers/cairo/CairoFaceInfo.h: Protect the name id.
* Source/cairo/CairoGState.m: Reorder variable declarations before
GS_BEGINITEMBUF as some compilers may complain.
Patch by Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
2011-05-15 Eric Wasylishen <ewasylishen@gmail.com>
* Source/x11/XGServerWindow.m:
@ -41,14 +49,14 @@
methods with macros.
2011-04-17 Eric Wasylishen <ewasylishen@gmail.com>
* configure.ac: Copy the -Wdeclaration-after-statement test from
base. Also adds -Wall.
2011-04-14 Eric Wasylishen <ewasylishen@gmail.com>
* Source/cairo/CairoFontEnumerator.m:
* Headers/cairo/CairoFontEnumerator.h: Override
* Headers/cairo/CairoFontEnumerator.h: Override
-matchingFontDescriptorsFor: to delegate the matching to Fontconfig
This uses two utility classes which map Fontconfig patterns

2
Headers/cairo/CairoFaceInfo.h
View file

@ -34,7 +34,9 @@
#include <Foundation/Foundation.h>
#include <ft2build.h>
#include FT_FREETYPE_H
#define id cairo_id
#include <cairo-ft.h>
#undef id
@interface CairoFaceInfo : NSObject
{

2
Headers/cairo/CairoFontEnumerator.h
View file

@ -30,7 +30,9 @@
#include <GNUstepGUI/GSFontInfo.h>
#include <cairo.h>
#define id fontconfig_id
#include <fontconfig/fontconfig.h>
#undef id
#include "cairo/CairoFaceInfo.h"
@interface CairoFontEnumerator : GSFontEnumerator

4
Source/cairo/CairoGState.m
View file

@ -417,8 +417,8 @@ static float floatToUserSpace(NSAffineTransform *ctm, float f)
{
if (_ct)
{
GS_BEGINITEMBUF(chars, length + 1, char);
device_color_t c;
GS_BEGINITEMBUF(chars, length + 1, char);
c = strokeColor;
gsColorToRGB(&c);
@ -599,9 +599,9 @@ static float floatToUserSpace(NSAffineTransform *ctm, float f)
{
if (_ct)
{
GS_BEGINITEMBUF(dpat, size, double);
double doffset = (double)floatFromUserSpace(ctm, foffset);
int i;
GS_BEGINITEMBUF(dpat, size, double);
i = size;
while (i)