summaryrefslogtreecommitdiffstats
path: root/tools/mergetr
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-28 15:50:52 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-28 15:50:52 -0500
commitebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (patch)
tree2b17bdf68dd5a96e5ef742207426f65010aedac6 /tools/mergetr
parentb129c37241b8777665c2c063713d496e43e934b2 (diff)
downloadqt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.tar.gz
qt3-ebcb1d80bf517aceb69778e1e9f67e5f4da8c484.zip
Fix build warnings
Thanks to Bruce Sass for the patch!
Diffstat (limited to 'tools/mergetr')
-rw-r--r--tools/mergetr/mergetr.cpp2
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);
}