Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compilation on OSX #37

Open
wants to merge 1 commit into
base: php7
Choose a base branch
from
Open

Fix compilation on OSX #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/php_cairo_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,12 @@ extern cairo_status_t php_cairo_read_func(void *closure, const unsigned char *da
/* Font + FontFace */
typedef struct _cairo_font_face_object {
cairo_font_face_t *font_face;
stream_closure *closure;
#if defined(CAIRO_HAS_QUARTZ_FONT)
CGFontRef quartzref;
#endif
stream_closure *closure;
cairo_user_data_key_t key;
zend_object std;
zend_object std;
} cairo_font_face_object;

extern zend_object* cairo_font_face_create_object(zend_class_entry *ce);
Expand Down
4 changes: 3 additions & 1 deletion src/quartz_font.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#endif

#include <cairo.h>
#include <cairo-quartz.h>
#include <ApplicationServices/ApplicationServices.h>
#include <php.h>
#include <zend_exceptions.h>

Expand Down Expand Up @@ -115,7 +117,7 @@ PHP_METHOD(CairoQuartzFontFace, createForCgfont)
/* {{{ cairo_quartz_font_methods[] */
const zend_function_entry cairo_quartz_font_methods[] = {
PHP_ME(CairoQuartzFontFace, createForCgfont, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(CairoQuartzFontFace, createForAtsuiFontId, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(CairoQuartzFontFace, createForAtsuFontId, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_FE_END
};
/* }}} */
Expand Down
2 changes: 1 addition & 1 deletion src/region.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "php_cairo.h"

zend_class_entry *ce_cairo_region;
zend_class_entry *ce_cairo_rectangle;
extern zend_class_entry *ce_cairo_rectangle;
zend_class_entry *ce_cairo_region_overlap;

static zend_object_handlers cairo_region_object_handlers;
Expand Down