Merge branch 'wt/rename' into api-hardening

# Conflicts:
#	README.md

1 files changed, 10 insertions, 10 deletions

diff --git a/src/gstore.h b/src/gstore.h
index 0cedd30..e4610ce 100644
--- a/src/gstore.h
+++ b/src/gstore.h
@@ -6,31 +6,31 @@
 #include <stdint.h>
 
 struct gstore;
-struct term;
+struct wsap_vtcore;
 
 /* Create a grapheme store for a terminal. */
-struct gstore *term_gstore_new(struct term *t);
+struct gstore *wsap_vtcore_gstore_new(struct wsap_vtcore *t);
 
 /* Free the grapheme store and its memory. */
-void term_gstore_free(struct gstore *g);
+void wsap_vtcore_gstore_free(struct gstore *g);
 
 /* Store a cluster of code points. Return its handle. */
-uint32_t term_gstore_intern(struct gstore *g, const uint32_t *cps, int n);
+uint32_t wsap_vtcore_gstore_intern(struct gstore *g, const uint32_t *cps, int n);
 
 /* Expand a handle to its code points. Return the count. */
-int term_gstore_expand(const struct gstore *g, uint32_t handle, uint32_t *cps, int cap);
+int wsap_vtcore_gstore_expand(const struct gstore *g, uint32_t handle, uint32_t *cps, int cap);
 
 /* Mark reachable clusters and free unused ones. */
-void term_gstore_sweep(struct gstore *g, struct term *t);
+void wsap_vtcore_gstore_sweep(struct gstore *g, struct wsap_vtcore *t);
 
 /* Mark one cluster handle as reachable. */
-void term_gstore_mark(struct gstore *g, uint32_t handle);
+void wsap_vtcore_gstore_mark(struct gstore *g, uint32_t handle);
 
 /* Return the count of active clusters in the store. */
-uint32_t term_gstore_count(const struct gstore *g);
+uint32_t wsap_vtcore_gstore_count(const struct gstore *g);
 
 /* Suppress automatic GC sweeps while temporary cell buffers hold handles. */
-void term_gstore_pin(struct gstore *g);
-void term_gstore_unpin(struct gstore *g);
+void wsap_vtcore_gstore_pin(struct gstore *g);
+void wsap_vtcore_gstore_unpin(struct gstore *g);
 
 #endif