Skip to content

Commit 2cd370d

Browse files
committed
changes for osx, start versioning
1 parent 782c094 commit 2cd370d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+308
-43
lines changed

LICENSE

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
--------------------------------------------------------------------
2+
The PHP License, version 3.01
3+
Copyright (c) 2012-2014 Joe Watkins. All rights reserved.
4+
--------------------------------------------------------------------
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, is permitted provided that the following conditions
8+
are met:
9+
10+
1. Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
2. Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in
15+
the documentation and/or other materials provided with the
16+
distribution.
17+
18+
3. The name "PHP" must not be used to endorse or promote products
19+
derived from this software without prior written permission. For
20+
written permission, please contact [email protected].
21+
22+
4. Products derived from this software may not be called "PHP", nor
23+
may "PHP" appear in their name, without prior written permission
24+
from [email protected]. You may indicate that your software works in
25+
conjunction with PHP by saying "Foo for PHP" instead of calling
26+
it "PHP Foo" or "phpfoo"
27+
28+
5. The PHP Group may publish revised and/or new versions of the
29+
license from time to time. Each version will be given a
30+
distinguishing version number.
31+
Once covered code has been published under a particular version
32+
of the license, you may always continue to use it under the terms
33+
of that version. You may also choose to use such covered code
34+
under the terms of any subsequent version of the license
35+
published by the PHP Group. No one other than the PHP Group has
36+
the right to modify the terms applicable to covered code created
37+
under this License.
38+
39+
6. Redistributions of any form whatsoever must retain the following
40+
acknowledgment:
41+
"This product includes PHP software, freely available from
42+
<http://www.php.net/software/>".
43+
44+
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
45+
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
46+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
47+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
48+
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
51+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
52+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
53+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
55+
OF THE POSSIBILITY OF SUCH DAMAGE.
56+
57+
--------------------------------------------------------------------
58+
59+
The PHP Group can be contacted via Email at [email protected].
60+
61+
For more information on the PHP Group and the PHP project,
62+
please see <http://www.php.net>.
63+
64+
PHP includes the Zend Engine, freely available at
65+
<http://www.zend.com>.

classes/app.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
#include <classes/app.h>
2525
#include <classes/window.h>
2626

27+
zend_class_entry *uiApp_ce;
28+
2729
zend_object_handlers php_ui_app_handlers;
2830

2931
extern void php_ui_set_call(zend_object *object, const char *name, size_t nlength, zend_fcall_info *fci, zend_fcall_info_cache *fcc);

classes/app.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef HAVE_PHP_UI_APP_H
1919
#define HAVE_PHP_UI_APP_H
2020

21-
zend_class_entry *uiApp_ce;
21+
extern zend_class_entry *uiApp_ce;
2222

2323
typedef struct _php_ui_app_t {
2424
HashTable windows;

classes/area.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929

3030
zend_object_handlers php_ui_area_handlers;
3131

32+
zend_class_entry *uiArea_ce;
33+
3234
extern void php_ui_set_call(zend_object *object, const char *name, size_t nlength, zend_fcall_info *fci, zend_fcall_info_cache *fcc);
3335

3436
static void php_ui_area_draw(uiAreaHandler *handler, uiArea *_area, uiAreaDrawParams *p) {

classes/area.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef HAVE_PHP_UI_AREA_H
1919
#define HAVE_PHP_UI_AREA_H
2020

21-
zend_class_entry *uiArea_ce;
21+
extern zend_class_entry *uiArea_ce;
2222

2323
typedef struct _php_ui_area_t {
2424
uiArea *a;

classes/box.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
zend_object_handlers php_ui_box_handlers;
2828

29+
zend_class_entry *uiBox_ce;
30+
2931
zend_object* php_ui_box_create(zend_class_entry *ce) {
3032
php_ui_box_t *box =
3133
(php_ui_box_t*) ecalloc(1, sizeof(php_ui_box_t) + zend_object_properties_size(ce));

classes/box.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef HAVE_PHP_UI_BOX_H
1919
#define HAVE_PHP_UI_BOX_H
2020

21-
zend_class_entry *uiBox_ce;
21+
extern zend_class_entry *uiBox_ce;
2222

2323
typedef struct _php_ui_box_t {
2424
uiBox *b;

classes/brush.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
zend_object_handlers php_ui_brush_handlers;
2828

29+
zend_class_entry *uiDrawBrush_ce;
30+
2931
static inline uiDrawBrushType php_ui_brush_type(zend_long type) {
3032
switch (type) {
3133
case PHP_UI_BRUSH_SOLID: return uiDrawBrushTypeSolid;

classes/brush.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef HAVE_PHP_UI_BRUSH_H
1919
#define HAVE_PHP_UI_BRUSH_H
2020

21-
zend_class_entry *uiDrawBrush_ce;
21+
extern zend_class_entry *uiDrawBrush_ce;
2222

2323
typedef struct _php_ui_brush_t {
2424
uiDrawBrush b;

classes/button.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
zend_object_handlers php_ui_button_handlers;
2828

29+
zend_class_entry *uiButton_ce;
30+
2931
extern void php_ui_set_call(zend_object *object, const char *name, size_t nlength, zend_fcall_info *fci, zend_fcall_info_cache *fcc);
3032

3133
zend_object* php_ui_button_create(zend_class_entry *ce) {

0 commit comments

Comments
 (0)