From 3bdfe1a336a4562f4acf8ef4144cc0f3831efa39 Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Tue, 12 Oct 2021 23:27:49 +0200 Subject: [PATCH] Minor cleanup --- src/runtime/c/Makefile.am | 2 +- src/runtime/c/pgf/data.h | 10 ++-------- src/runtime/c/pgf/pgf.cxx | 10 ++-------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/runtime/c/Makefile.am b/src/runtime/c/Makefile.am index 9018df159..d46287d3b 100644 --- a/src/runtime/c/Makefile.am +++ b/src/runtime/c/Makefile.am @@ -28,7 +28,7 @@ libpgf_la_SOURCES = \ pgf/namespace.h libpgf_la_LDFLAGS = -no-undefined -libpgf_la_LIBADD = +# libpgf_la_LIBADD = -lrt libpgf_la_CXXFLAGS = -fno-rtti -std=c++11 bin_PROGRAMS = diff --git a/src/runtime/c/pgf/data.h b/src/runtime/c/pgf/data.h index 1f2592520..02b98a390 100644 --- a/src/runtime/c/pgf/data.h +++ b/src/runtime/c/pgf/data.h @@ -123,13 +123,7 @@ struct PGF_INTERNAL_DECL PgfPGF { static void release(ref pgf); }; -// extern PGF_INTERNAL_DECL -// PgfText master; - -extern PGF_INTERNAL_DECL -size_t master_size; - -extern PGF_INTERNAL_DECL -char master_text[]; +extern PGF_INTERNAL_DECL size_t master_size; +extern PGF_INTERNAL_DECL char master_text[]; #endif diff --git a/src/runtime/c/pgf/pgf.cxx b/src/runtime/c/pgf/pgf.cxx index 960dd62d4..7f55da512 100644 --- a/src/runtime/c/pgf/pgf.cxx +++ b/src/runtime/c/pgf/pgf.cxx @@ -30,14 +30,8 @@ pgf_exn_clear(PgfExn* err) err->msg = strdup(e.what()); \ } -// PGF_INTERNAL -// PgfText master = {size: 6, text: {}}; - -PGF_INTERNAL -size_t master_size = 6; - -PGF_INTERNAL -char master_text[] = {'m','a','s','t','e','r',0}; +PGF_INTERNAL size_t master_size = 6; +PGF_INTERNAL char master_text[] = {'m','a','s','t','e','r',0}; PGF_API PgfDB *pgf_read_pgf(const char* fpath,