From c67c81a8fb726c151180d31d79faabe2b291a496 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sat, 27 Apr 2019 07:53:50 +0200
Subject: grt: rename grt-dynload.[ch] to grt-cdynload.[ch]

---
 src/grt/Makefile.inc   |  6 +++---
 src/grt/grt-cdynload.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/grt/grt-cdynload.h | 11 +++++++++++
 src/grt/grt-cvpi.c     |  2 +-
 src/grt/grt-dynload.c  | 52 --------------------------------------------------
 src/grt/grt-dynload.h  | 11 -----------
 6 files changed, 67 insertions(+), 67 deletions(-)
 create mode 100644 src/grt/grt-cdynload.c
 create mode 100644 src/grt/grt-cdynload.h
 delete mode 100644 src/grt/grt-dynload.c
 delete mode 100644 src/grt/grt-dynload.h

(limited to 'src/grt')

diff --git a/src/grt/Makefile.inc b/src/grt/Makefile.inc
index 89f0675ad..fe1bd38ef 100644
--- a/src/grt/Makefile.inc
+++ b/src/grt/Makefile.inc
@@ -71,7 +71,7 @@ GRT_FST_OBJS := fstapi.o lz4.o fastlz.o
 
 # Additionnal object files (C or asm files).
 GRT_BASE_C_OBJS:=$(GRT_TARGET_OBJS) grt-cbinding.o
-GRT_ADD_OBJS:=$(GRT_BASE_C_OBJS) grt-cvpi.o grt-dynload.o $(GRT_FST_OBJS)
+GRT_ADD_OBJS:=$(GRT_BASE_C_OBJS) grt-cvpi.o grt-cdynload.o $(GRT_FST_OBJS)
 GRT_ADD_SHOBJS:=$(patsubst %, pic/%, $(GRT_BASE_C_OBJS))
 
 # Source files create by grt.
@@ -164,10 +164,10 @@ grt-cvpi.o: $(GRTSRCDIR)/grt-cvpi.c
 pic/grt-cvpi.o: $(GRTSRCDIR)/grt-cvpi.c
 	$(GRT_C_COMPILE_PIC)
 
-grt-dynload.o: $(GRTSRCDIR)/grt-dynload.c
+grt-cdynload.o: $(GRTSRCDIR)/grt-cdynload.c
 	$(GRT_C_COMPILE)
 
-pic/grt-dynload.o: $(GRTSRCDIR)/grt-dynload.c
+pic/grt-cdynload.o: $(GRTSRCDIR)/grt-cdynload.c
 	$(GRT_C_COMPILE_PIC)
 
 grt-cthreads.o: $(GRTSRCDIR)/grt-cthreads.c
diff --git a/src/grt/grt-cdynload.c b/src/grt/grt-cdynload.c
new file mode 100644
index 000000000..af595f454
--- /dev/null
+++ b/src/grt/grt-cdynload.c
@@ -0,0 +1,52 @@
+#if defined(__WIN32__)
+#include <windows.h>
+void *
+grt_dynload_open (const char *path)
+{
+  return (void *)LoadLibrary (path);
+}
+
+void *
+grt_dynload_symbol (void *handle, const char *symbol)
+{
+  return (void *)GetProcAddress ((HMODULE)handle, symbol);
+}
+
+const char *
+grt_dynload_error (void)
+{
+  static char msg[256];
+
+  FormatMessage
+    (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+     NULL,
+     GetLastError (),
+     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+     (LPTSTR) &msg,
+     sizeof (msg) - 1,
+     NULL);
+  return msg;
+}
+
+#else
+
+#include <dlfcn.h>
+
+void *
+grt_dynload_open (const char *path)
+{
+  return dlopen (path, RTLD_LAZY);
+}
+
+void *
+grt_dynload_symbol (void *handle, const char *symbol)
+{
+  return dlsym (handle, symbol);
+}
+
+const char *
+grt_dynload_error (void)
+{
+  return dlerror ();
+}
+#endif
diff --git a/src/grt/grt-cdynload.h b/src/grt/grt-cdynload.h
new file mode 100644
index 000000000..ff2551a2f
--- /dev/null
+++ b/src/grt/grt-cdynload.h
@@ -0,0 +1,11 @@
+/* Very simple wrappers for loading dll/so files.  */
+#ifndef __GRT_DYNLOAD__
+#define __GRT_DYNLOAD__
+
+void * grt_dynload_open (const char *path);
+void * grt_dynload_symbol (void *handle, const char *symbol);
+const char *grt_dynload_error (void);
+
+#endif /* __GRT_DYNLOAD__ */
+
+
diff --git a/src/grt/grt-cvpi.c b/src/grt/grt-cvpi.c
index 17f0e75af..2a00ebb42 100644
--- a/src/grt/grt-cvpi.c
+++ b/src/grt/grt-cvpi.c
@@ -32,7 +32,7 @@
 
 #include "vpi_user.h"
 #include "vpi_thunk.h"
-#include "grt-dynload.h"
+#include "grt-cdynload.h"
 
 /* Extension of a shared library.  */
 #if defined (WINNT)
diff --git a/src/grt/grt-dynload.c b/src/grt/grt-dynload.c
deleted file mode 100644
index af595f454..000000000
--- a/src/grt/grt-dynload.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#if defined(__WIN32__)
-#include <windows.h>
-void *
-grt_dynload_open (const char *path)
-{
-  return (void *)LoadLibrary (path);
-}
-
-void *
-grt_dynload_symbol (void *handle, const char *symbol)
-{
-  return (void *)GetProcAddress ((HMODULE)handle, symbol);
-}
-
-const char *
-grt_dynload_error (void)
-{
-  static char msg[256];
-
-  FormatMessage
-    (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-     NULL,
-     GetLastError (),
-     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-     (LPTSTR) &msg,
-     sizeof (msg) - 1,
-     NULL);
-  return msg;
-}
-
-#else
-
-#include <dlfcn.h>
-
-void *
-grt_dynload_open (const char *path)
-{
-  return dlopen (path, RTLD_LAZY);
-}
-
-void *
-grt_dynload_symbol (void *handle, const char *symbol)
-{
-  return dlsym (handle, symbol);
-}
-
-const char *
-grt_dynload_error (void)
-{
-  return dlerror ();
-}
-#endif
diff --git a/src/grt/grt-dynload.h b/src/grt/grt-dynload.h
deleted file mode 100644
index ff2551a2f..000000000
--- a/src/grt/grt-dynload.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Very simple wrappers for loading dll/so files.  */
-#ifndef __GRT_DYNLOAD__
-#define __GRT_DYNLOAD__
-
-void * grt_dynload_open (const char *path);
-void * grt_dynload_symbol (void *handle, const char *symbol);
-const char *grt_dynload_error (void);
-
-#endif /* __GRT_DYNLOAD__ */
-
-
-- 
cgit v1.2.3