diff options
| author |  Jonathan Beck | 2009-01-29 18:02:04 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-01-29 18:02:04 +0100 |
| commit | c1b2004461aaf2912af749620e7504345bf409ba (patch) | |
| tree | 2c238a2d8c1598265a07a2fd52beec0939d08a73 /src/utils.c | |
| parent | 0934d1ac021dfb7907e4b580b38aa4a938cf2180 (diff) | |
| parent | f7fbac7803c5cb5934aab58925babc70af4ab848 (diff) | |
| download | libimobiledevice-c1b2004461aaf2912af749620e7504345bf409ba.tar.gz libimobiledevice-c1b2004461aaf2912af749620e7504345bf409ba.tar.bz2 | |
Merge branch 'master' into contact_sync
Conflicts:
src/Makefile.am
src/iphone.c
src/lockdown.c
src/lockdown.h
src/utils.c
Diffstat (limited to 'src/utils.c')
| -rw-r--r-- | src/utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/utils.c b/src/utils.c index 988cb03..5b0872d 100644 --- a/src/utils.c +++ b/src/utils.c | |||
| @@ -66,7 +66,6 @@ void log_debug_msg(const char *format, ...) | |||
| 66 | void log_dbg_msg(uint16_t id, const char *format, ...) | 66 | void log_dbg_msg(uint16_t id, const char *format, ...) |
| 67 | { | 67 | { |
| 68 | #ifndef STRIP_DEBUG_CODE | 68 | #ifndef STRIP_DEBUG_CODE |
| 69 | |||
| 70 | if (id & dbg_mask) { | 69 | if (id & dbg_mask) { |
| 71 | va_list args; | 70 | va_list args; |
| 72 | /* run the real fprintf */ | 71 | /* run the real fprintf */ |