From 60bf22f48427a1ccb646bff6a0b340e8c46201a6 Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Tue, 6 Jan 2009 20:16:36 +0000
Subject: [PATCH] misc

---
 cmd/tools/gvpack_builtins.c | 2 +-
 lib/common/render.h         | 1 -
 lib/gvc/dot_builtins.c      | 2 +-
 lib/gvc/gvcext.h            | 6 +-----
 lib/gvc/no_builtins.c       | 4 ----
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/cmd/tools/gvpack_builtins.c b/cmd/tools/gvpack_builtins.c
index 5078f35db..18e185f2d 100644
--- a/cmd/tools/gvpack_builtins.c
+++ b/cmd/tools/gvpack_builtins.c
@@ -18,7 +18,7 @@
 
 extern gvplugin_library_t gvplugin_neato_layout_LTX_library;
 
-const lt_symlist_t lt_preloaded_symbols[] = {
+lt_symlist_t lt_preloaded_symbols[] = {
     { "gvplugin_neato_layout_LTX_library", (void*)(&gvplugin_neato_layout_LTX_library) },
     { 0, 0 }
 };
diff --git a/lib/common/render.h b/lib/common/render.h
index 451eab01c..4b7c2ffd0 100644
--- a/lib/common/render.h
+++ b/lib/common/render.h
@@ -89,7 +89,6 @@ extern "C" {
     extern void dotneato_set_margins(GVC_t * gvc, Agraph_t *);
     extern void dotneato_write(GVC_t * gvc, graph_t *g);
     extern void dotneato_write_one(GVC_t * gvc, graph_t *g);
-    extern double elapsed_sec(void);
     extern void emit_clusters(GVJ_t * job, Agraph_t * g, int flags);
     /* extern void emit_begin_edge(GVJ_t * job, edge_t * e, char**); */
     /* extern void emit_end_edge(GVJ_t * job); */
diff --git a/lib/gvc/dot_builtins.c b/lib/gvc/dot_builtins.c
index 042ad1bca..d27473ad0 100644
--- a/lib/gvc/dot_builtins.c
+++ b/lib/gvc/dot_builtins.c
@@ -86,7 +86,7 @@ init_lt_preloaded_symbols()
     }
 }
 #else
-const lt_symlist_t lt_preloaded_symbols[] = {
+lt_symlist_t lt_preloaded_symbols[] = {
 	{ "gvplugin_dot_layout_LTX_library", (void*)(&gvplugin_dot_layout_LTX_library) },
 	{ "gvplugin_neato_layout_LTX_library", (void*)(&gvplugin_neato_layout_LTX_library) },
 #ifdef HAVE_PANGOCAIRO
diff --git a/lib/gvc/gvcext.h b/lib/gvc/gvcext.h
index 87ccfc5e1..123e15590 100644
--- a/lib/gvc/gvcext.h
+++ b/lib/gvc/gvcext.h
@@ -71,14 +71,10 @@ extern "C" {
     typedef struct gvplugin_available_s gvplugin_available_t;
 
 
-#if !defined (ENABLE_LTDL)
-	 lt_symlist_t lt_preloaded_symbols[];
-#else
 #if defined(GVDLL)
 	__declspec(dllexport) lt_symlist_t lt_preloaded_symbols[];
 #else
-	extern const lt_symlist_t lt_preloaded_symbols[] ;
-#endif
+	extern lt_symlist_t lt_preloaded_symbols[];
 #endif
 
 #ifdef __cplusplus
diff --git a/lib/gvc/no_builtins.c b/lib/gvc/no_builtins.c
index 5c89357de..67ad01853 100644
--- a/lib/gvc/no_builtins.c
+++ b/lib/gvc/no_builtins.c
@@ -20,8 +20,4 @@
 
 #include "gvcext.h"
 
-#if defined(GVDLL) && !defined(ENABLE_LTDL)
 lt_symlist_t lt_preloaded_symbols[] = { { 0, 0 } };
-#else
-const lt_symlist_t lt_preloaded_symbols[] = { { 0, 0 } };
-#endif
-- 
2.40.0