From c44dbfc6de751590c6a9a654ab06d63fc78fbb54 Mon Sep 17 00:00:00 2001
From: "Dmitry E. Oboukhov" <unera@debian.org>
Date: Wed, 19 Jun 2013 15:27:35 +0400
Subject: [PATCH] Delete double underscore, fix uncertainty in test.
---
include/tarantool_plugin.h | 10 +++++-----
src/plugins/pg/CMakeLists.txt | 1 -
test/box/admin.result | 6 ------
test/box/admin.test | 1 -
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/include/tarantool_plugin.h b/include/tarantool_plugin.h
index 02db5a6e14..a5c580c631 100644
--- a/include/tarantool_plugin.h
+++ b/include/tarantool_plugin.h
@@ -49,14 +49,14 @@ struct tarantool_plugin {
struct rlist list;
};
-#define DECLARE_PLUGIN(__name, __version, __init, __stat) \
+#define DECLARE_PLUGIN(name, version, init, stat) \
extern "C" { \
struct tarantool_plugin plugin_meta = { \
PLUGIN_API_VERSION, \
- __version, \
- __name, \
- __init, \
- __stat, \
+ version, \
+ name, \
+ init, \
+ stat, \
{ NULL, NULL } \
}; \
}
diff --git a/src/plugins/pg/CMakeLists.txt b/src/plugins/pg/CMakeLists.txt
index 50f3377db9..f4cfc461d3 100644
--- a/src/plugins/pg/CMakeLists.txt
+++ b/src/plugins/pg/CMakeLists.txt
@@ -7,7 +7,6 @@ if (PostgreSQL_FOUND)
add_compile_flags("C;CXX" "-I${PostgreSQL_INCLUDE_DIR}")
add_compile_flags("C;CXX" "-L${PostgreSQL_LIBRARY_DIR}")
add_compile_flags("C;CXX" "-l${PostgreSQL_LIBRARIES}")
- add_compile_flags("C;CXX" "-shared")
add_library(pg SHARED pg.cc)
install(TARGETS pg LIBRARY DESTINATION ${PLUGIN_DIR})
diff --git a/test/box/admin.result b/test/box/admin.result
index 91bbd90586..5e9a0f43e4 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -77,12 +77,6 @@ configuration:
space[0].index[0].key_field[0].fieldno: "0"
space[0].index[0].key_field[0].type: "NUM"
...
-show plugins
----
-plugins:
- - { name: "postgresql", version: 1 }
- - { name: "mysql", version: 1 }
-...
show stat
---
statistics:
diff --git a/test/box/admin.test b/test/box/admin.test
index 6e1aacb7e9..fb23748249 100644
--- a/test/box/admin.test
+++ b/test/box/admin.test
@@ -8,7 +8,6 @@ exec admin "exit"
exec admin "show stat"
exec admin "help"
exec admin "show configuration"
-exec admin "show plugins"
exec admin "show stat"
exec sql "insert into t0 values (1, 'tuple')"
exec admin "save snapshot"
--
GitLab