diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
| commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
| tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /loader/registry.c | |
| parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
| parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
| download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'loader/registry.c')
| -rw-r--r-- | loader/registry.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/loader/registry.c b/loader/registry.c index 2eb449124c..b87c160e67 100644 --- a/loader/registry.c +++ b/loader/registry.c @@ -339,7 +339,6 @@ long __stdcall RegOpenKeyExA(long key, const char* subkey, long reserved, long a { char* full_name; reg_handle_t* t; - struct reg_value* v; TRACE("Opening key %s\n", subkey); if(!regs) @@ -357,7 +356,7 @@ long __stdcall RegOpenKeyExA(long key, const char* subkey, long reserved, long a if(!full_name) return -1; TRACE("Opening key Fullname %s\n", full_name); - v=find_value_by_name(full_name); + find_value_by_name(full_name); t=insert_handle(generate_handle(), full_name); *newkey=t->handle; |