diff options
| author | Joakim Verona | 2011-10-27 11:15:25 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-10-27 11:15:25 +0200 |
| commit | b70516db12801e015c538c4e7eb44cb87316afc4 (patch) | |
| tree | b5ed66a971e6f55d0b4628f7a56316b0fa383ddc /src/w32reg.c | |
| parent | 51a9916f39ce1cd562816a5429bc3cf6f407fabc (diff) | |
| parent | 435c1d6793ce358f4d2c77c9e9c1ad81fd754651 (diff) | |
| download | emacs-b70516db12801e015c538c4e7eb44cb87316afc4.tar.gz emacs-b70516db12801e015c538c4e7eb44cb87316afc4.zip | |
upstream
Diffstat (limited to 'src/w32reg.c')
| -rw-r--r-- | src/w32reg.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/w32reg.c b/src/w32reg.c index e1465be9e44..18374431062 100644 --- a/src/w32reg.c +++ b/src/w32reg.c | |||
| @@ -147,9 +147,9 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class) | |||
| 147 | { | 147 | { |
| 148 | char *resource; | 148 | char *resource; |
| 149 | 149 | ||
| 150 | if (resource = w32_get_rdb_resource (rdb, name)) | 150 | if ((resource = w32_get_rdb_resource (rdb, name))) |
| 151 | return resource; | 151 | return resource; |
| 152 | if (resource = w32_get_rdb_resource (rdb, class)) | 152 | if ((resource = w32_get_rdb_resource (rdb, class))) |
| 153 | return resource; | 153 | return resource; |
| 154 | } | 154 | } |
| 155 | 155 | ||
| @@ -157,6 +157,5 @@ x_get_string_resource (XrmDatabase rdb, char *name, char *class) | |||
| 157 | /* --quick was passed, so this is a no-op. */ | 157 | /* --quick was passed, so this is a no-op. */ |
| 158 | return NULL; | 158 | return NULL; |
| 159 | 159 | ||
| 160 | return (w32_get_string_resource (name, class, REG_SZ)); | 160 | return w32_get_string_resource (name, class, REG_SZ); |
| 161 | } | 161 | } |
| 162 | |||