merge 3.4

This commit is contained in:
Benjamin Peterson 2014-11-06 00:53:18 -05:00
commit 8726f2b89c
1 changed files with 4 additions and 4 deletions

View File

@ -527,10 +527,10 @@ EXPORT(int) PointInRect(RECT *prc, POINT pt)
return 1;
}
EXPORT(int left = 10);
EXPORT(int top = 20);
EXPORT(int right = 30);
EXPORT(int bottom = 40);
EXPORT(long left = 10);
EXPORT(long top = 20);
EXPORT(long right = 30);
EXPORT(long bottom = 40);
EXPORT(RECT) ReturnRect(int i, RECT ar, RECT* br, POINT cp, RECT dr,
RECT *er, POINT fp, RECT gr)