diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /src/database-redis.h | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'src/database-redis.h')
| -rw-r--r-- | src/database-redis.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/database-redis.h b/src/database-redis.h index 3addaa20a..fa15dd8a7 100644 --- a/src/database-redis.h +++ b/src/database-redis.h @@ -24,13 +24,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #if USE_REDIS -#include "database.h" #include <hiredis.h> #include <string> +#include "database.h" class Settings; -class Database_Redis : public Database +class Database_Redis : public MapDatabase { public: Database_Redis(Settings &conf); @@ -52,4 +52,3 @@ private: #endif // USE_REDIS #endif - |