diff options
Diffstat (limited to 'f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff')
| -rw-r--r-- | f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff b/f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff deleted file mode 100644 index e64883c652e3..000000000000 --- a/f484c603a81c3bddd3f0160cfdbe231b8a453cde.diff +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/dev/Gemfile b/dev/Gemfile -index 567848b5..55292781 100644 ---- a/dev/Gemfile -+++ b/dev/Gemfile -@@ -41,4 +41,4 @@ gem 'minitest-reporters' - - gem 'fpm', :git => "https://github.com/slact/fpm.git" - --gem 'hsss' -+gem 'hsss', "~> 0.1.20" -diff --git a/dev/rebuild.sh b/dev/rebuild.sh -index ab443f54..49bc5be9 100755 ---- a/dev/rebuild.sh -+++ b/dev/rebuild.sh -@@ -244,6 +244,7 @@ if [[ -z $NO_MAKE ]]; then - bundle exec hsss \ - --format whole \ - --header-only \ -+ --header-guard NCHAN_REDIS_LUA_SCRIPTS_H \ - --no-static \ - ${rdstore_dir}/redis-lua-scripts/*.lua > ${rdstore_dir}/redis_lua_commands.h - if ! [ $? -eq 0 ]; then; -diff --git a/src/store/memory/memstore.c b/src/store/memory/memstore.c -index 2844220c..f0f78acc 100755 ---- a/src/store/memory/memstore.c -+++ b/src/store/memory/memstore.c -@@ -40,6 +40,8 @@ static ngx_int_t redis_fakesub_timer_interval; - - #endif - -+uint16_t memstore_worker_generation; -+ - - typedef struct { - //memstore_channel_head_t unbuffered_dummy_chanhead; -diff --git a/src/store/memory/store-private.h b/src/store/memory/store-private.h -index e4a426a3..49de940b 100644 ---- a/src/store/memory/store-private.h -+++ b/src/store/memory/store-private.h -@@ -172,6 +172,6 @@ ngx_int_t chanhead_gc_withdraw(memstore_channel_head_t *chanhead, const char *); - void memstore_chanhead_release(memstore_channel_head_t *ch, char *label); - void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label); - --uint16_t memstore_worker_generation; //times nginx has been restarted + 1 -+extern uint16_t memstore_worker_generation; //times nginx has been restarted + 1 - - #endif /*MEMSTORE_PRIVATE_HEADER*/ -diff --git a/src/store/redis/redis_lua_commands.h b/src/store/redis/redis_lua_commands.h -index 76fb7b95..2efb25bd 100644 ---- a/src/store/redis/redis_lua_commands.h -+++ b/src/store/redis/redis_lua_commands.h -@@ -1,3 +1,5 @@ -+#ifndef NCHAN_REDIS_LUA_SCRIPTS_H -+#define NCHAN_REDIS_LUA_SCRIPTS_H - // don't edit this please, it was auto-generated by hsss - // https://github.com/slact/hsss - -@@ -63,7 +65,8 @@ typedef struct { - redis_lua_script_t subscriber_unregister; - - } redis_lua_scripts_t; --redis_lua_scripts_t redis_lua_scripts; --const int redis_lua_scripts_count; -+extern redis_lua_scripts_t redis_lua_scripts; -+extern const int redis_lua_scripts_count; - #define REDIS_LUA_SCRIPTS_EACH(script) \ - for((script)=(redis_lua_script_t *)&redis_lua_scripts; (script) < (redis_lua_script_t *)(&redis_lua_scripts + 1); (script)++) -+#endif //NCHAN_REDIS_LUA_SCRIPTS_H |