From 8e2004cf6773cc8d880f269d4e0451af229e0729 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 15 Apr 2018 22:43:14 -0400
Subject: [PATCH] struct graphemes -> uiprivGraphemes. Also deleted
 OLD_uipriv.h now that that one is settled.

---
 common/OLD_uipriv.h   | 3 ---
 common/attrstr.c      | 2 +-
 common/attrstr.h      | 5 +++--
 darwin/graphemes.m    | 6 +++---
 unix/graphemes.c      | 6 +++---
 windows/graphemes.cpp | 6 +++---
 6 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 common/OLD_uipriv.h

diff --git a/common/OLD_uipriv.h b/common/OLD_uipriv.h
deleted file mode 100644
index 95ab829c..00000000
--- a/common/OLD_uipriv.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-// OS-specific text.* files
-extern int uiprivStricmp(const char *a, const char *b);
diff --git a/common/attrstr.c b/common/attrstr.c
index ee2b1616..2445c330 100644
--- a/common/attrstr.c
+++ b/common/attrstr.c
@@ -18,7 +18,7 @@ struct uiAttributedString {
 	size_t *u16tou8;
 
 	// this is lazily created to keep things from getting *too* slow
-	struct graphemes *graphemes;
+	uiprivGraphemes *graphemes;
 };
 
 static void resize(uiAttributedString *s, size_t u8, size_t u16)
diff --git a/common/attrstr.h b/common/attrstr.h
index 54e43feb..475589f3 100644
--- a/common/attrstr.h
+++ b/common/attrstr.h
@@ -28,10 +28,11 @@ extern size_t *uiprivAttributedStringCopyUTF8ToUTF16Table(const uiAttributedStri
 extern size_t *uiprivAttributedStringCopyUTF16ToUTF8Table(const uiAttributedString *s, size_t *n);
 
 // per-OS graphemes.c/graphemes.cpp/graphemes.m/etc.
-struct graphemes {
+typedef struct uiprivGraphemes uiprivGraphemes;
+struct uiprivGraphemes {
 	size_t len;
 	size_t *pointsToGraphemes;
 	size_t *graphemesToPoints;
 };
 extern int uiprivGraphemesTakesUTF16(void);
-extern struct graphemes *uiprivNewGraphemes(void *s, size_t len);
+extern uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len);
diff --git a/darwin/graphemes.m b/darwin/graphemes.m
index 3fdbc17e..a92534f3 100644
--- a/darwin/graphemes.m
+++ b/darwin/graphemes.m
@@ -10,16 +10,16 @@ int uiprivGraphemesTakesUTF16(void)
 	return 1;
 }
 
-struct graphemes *uiprivNewGraphemes(void *s, size_t len)
+uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len)
 {
-	struct graphemes *g;
+	uiprivGraphemes *g;
 	UniChar *str = (UniChar *) s;
 	CFStringRef cfstr;
 	size_t ppos, gpos;
 	CFRange range;
 	size_t i;
 
-	g = uiprivNew(struct graphemes);
+	g = uiprivNew(uiprivGraphemes);
 
 	cfstr = CFStringCreateWithCharactersNoCopy(NULL, str, len, kCFAllocatorNull);
 	if (cfstr == NULL) {
diff --git a/unix/graphemes.c b/unix/graphemes.c
index b5edb95a..952f1ef8 100644
--- a/unix/graphemes.c
+++ b/unix/graphemes.c
@@ -7,16 +7,16 @@ int uiprivGraphemesTakesUTF16(void)
 	return 0;
 }
 
-struct graphemes *uiprivNewGraphemes(void *s, size_t len)
+uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len)
 {
-	struct graphemes *g;
+	uiprivGraphemes *g;
 	char *text = (char *) s;
 	size_t lenchars;
 	PangoLogAttr *logattrs;
 	size_t i;
 	size_t *op;
 
-	g = uiprivNew(struct graphemes);
+	g = uiprivNew(uiprivGraphemes);
 
 	// TODO see if we can use the utf routines
 	lenchars = g_utf8_strlen(text, -1);
diff --git a/windows/graphemes.cpp b/windows/graphemes.cpp
index 266cf97f..c11dd203 100644
--- a/windows/graphemes.cpp
+++ b/windows/graphemes.cpp
@@ -11,13 +11,13 @@ int uiprivGraphemesTakesUTF16(void)
 	return 1;
 }
 
-struct graphemes *uiprivNewGraphemes(void *s, size_t len)
+uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len)
 {
-	struct graphemes *g;
+	uiprivGraphemes *g;
 	WCHAR *str;
 	size_t *pPTG, *pGTP;
 
-	g = uiprivNew(struct graphemes);
+	g = uiprivNew(uiprivGraphemes);
 
 	g->len = 0;
 	str = (WCHAR *) s;