andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(NS_HAVE_NSINTEGER): Back out and augment with CGFloat, still needed under Tiger.

Browse source
This commit is contained in:
Adrian Robert 2009-10-16 03:09:06 +00:00
parent ca515f00ea
commit 5cca5bf08f
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/nsterm.h
View file

@ -54,7 +54,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
@class EmacsToolbar;
@interface EmacsView : NSView <NSTextInput,NSWindowDelegate>
@interface EmacsView : NSView <NSTextInput> /* 10.6+: NSWindowDelegate */
{
char *old_title;
BOOL windowClosing;
@ -104,7 +104,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
========================================================================== */
@interface EmacsMenu : NSMenu <NSMenuDelegate>
@interface EmacsMenu : NSMenu /* 10.6+: <NSMenuDelegate> */
{
struct frame *frame;
unsigned long keyEquivModMask;
@ -131,7 +131,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
@class EmacsImage;
@interface EmacsToolbar : NSToolbar <NSToolbarDelegate>
@interface EmacsToolbar : NSToolbar /* 10.6+: <NSToolbarDelegate> */
{
EmacsView *emacsView;
NSMutableDictionary *identifierToItem;
@ -174,7 +174,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
- (Lisp_Object)runDialogAt: (NSPoint)p;
@end
@interface EmacsTooltip : NSObject <NSWindowDelegate>
@interface EmacsTooltip : NSObject /* 10.6+: <NSWindowDelegate> */
{
NSWindow *win;
NSTextField *textField;
@ -328,6 +328,18 @@ 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__ */