diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:50:52 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-04 14:53:35 +0200 |
| commit | 5ae82a06c308960c66757b0a956500b05b83f002 (patch) | |
| tree | e73bef929c230d306f377880042ce09894812ccd /tools/mergetr | |
| parent | e9fed234b762ffe73037d70bf29ce90ea7ab8d37 (diff) | |
| download | qt3-3.5.13.1.tar.gz qt3-3.5.13.1.zip | |
Fix build warningsv3.5.13.1
Thanks to Bruce Sass for the patch!
(cherry picked from commit ebcb1d80bf517aceb69778e1e9f67e5f4da8c484)
Diffstat (limited to 'tools/mergetr')
| -rw-r--r-- | tools/mergetr/mergetr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp index c286a84..8588b3c 100644 --- a/tools/mergetr/mergetr.cpp +++ b/tools/mergetr/mergetr.cpp @@ -331,7 +331,7 @@ int main( int argc, char* argv[] ) int orgfile = 1; int newfile = 2; - if ( argc <= newfile || argc > 1 && argv[1][0] == '-') { + if ( argc <= newfile || ( argc > 1 && argv[1][0] == '-' ) ) { printf("usage: %s orgfile newfile [outfile]\n", argv[0]); exit(1); } |