From 221e8731c0fa370ed7c986817a3f78953afb5f47 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 6 May 2018 21:26:51 -0400 Subject: [PATCH] Revert "Avoid merge conflict in uipriv_darwin.h." Nope, this confused git further This reverts commit dc98bc2c255efdf99d4c7c4e12f17457d4958445. --- darwin/uipriv_darwin.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h index afd97691..c221464f 100644 --- a/darwin/uipriv_darwin.h +++ b/darwin/uipriv_darwin.h @@ -19,15 +19,6 @@ #define NSAppKitVersionNumber10_9 1265 #endif -// map.m -extern struct mapTable *newMap(void); -extern void mapDestroy(struct mapTable *m); -extern void *mapGet(struct mapTable *m, void *key); -extern void mapSet(struct mapTable *m, void *key, void *value); -extern void mapDelete(struct mapTable *m, void *key); -extern void mapWalk(struct mapTable *m, void (*f)(void *key, void *value)); -extern void mapReset(struct mapTable *m); - // menu.m @interface menuManager : NSObject { struct mapTable *items; @@ -97,6 +88,15 @@ extern void singleChildConstraintsEstablish(struct singleChildConstraints *c, NS extern void singleChildConstraintsRemove(struct singleChildConstraints *c, NSView *cv); extern void singleChildConstraintsSetMargined(struct singleChildConstraints *c, int margined); +// map.m +extern struct mapTable *newMap(void); +extern void mapDestroy(struct mapTable *m); +extern void *mapGet(struct mapTable *m, void *key); +extern void mapSet(struct mapTable *m, void *key, void *value); +extern void mapDelete(struct mapTable *m, void *key); +extern void mapWalk(struct mapTable *m, void (*f)(void *key, void *value)); +extern void mapReset(struct mapTable *m); + // area.m extern int sendAreaEvents(NSEvent *);