Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f10490f0
Commit
f10490f0
authored
Aug 13, 2013
by
Jan Djärv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* nsterm.h: Fix CGFloat for OSX 10.4.
Fixes: debbugs:15086
parent
c8ae93b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
15 deletions
+22
-15
src/ChangeLog
src/ChangeLog
+4
-0
src/nsterm.h
src/nsterm.h
+18
-15
No files found.
src/ChangeLog
View file @
f10490f0
2013-08-13 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086).
2013-08-13 Dmitry Antipov <dmantipov@yandex.ru>
* window.h (WINDOW_FRINGE_EXTENDED_P): New macro.
...
...
src/nsterm.h
View file @
f10490f0
...
...
@@ -53,9 +53,24 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* CGFloat on GNUStep may be 4 or 8 byte, but functions expect float* for some
versions.
On Cocoa, functions expect CGFloat*. Make compatible type. */
#if defined (NS_IMPL_COCOA) || GNUSTEP_GUI_MAJOR_VERSION > 0 || \
GNUSTEP_GUI_MINOR_VERSION >= 22
On Cocoa >= 10.5, functions expect CGFloat*. Make compatible type. */
#ifdef NS_IMPL_COCOA
#ifndef NS_HAVE_NSINTEGER
#if defined (__LP64__) && __LP64__
typedef
double
CGFloat
;
typedef
long
NSInteger
;
typedef
unsigned
long
NSUInteger
;
#else
typedef
float
CGFloat
;
typedef
int
NSInteger
;
typedef
unsigned
int
NSUInteger
;
#endif
/* not LP64 */
#endif
/* not NS_HAVE_NSINTEGER */
typedef
CGFloat
EmacsCGFloat
;
#elif GNUSTEP_GUI_MAJOR_VERSION > 0 || GNUSTEP_GUI_MINOR_VERSION >= 22
typedef
CGFloat
EmacsCGFloat
;
#else
typedef
float
EmacsCGFloat
;
...
...
@@ -424,18 +439,6 @@ extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
@end
#endif
#ifndef NS_HAVE_NSINTEGER
#if defined (__LP64__) && __LP64__
typedef
double
CGFloat
;
typedef
long
NSInteger
;
typedef
unsigned
long
NSUInteger
;
#else
typedef
float
CGFloat
;
typedef
int
NSInteger
;
typedef
unsigned
int
NSUInteger
;
#endif
/* not LP64 */
#endif
/* not NS_HAVE_NSINTEGER */
#endif
/* __OBJC__ */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment