bitmath: Finish up optimizations

[platform/upstream/flac.git] / src / metaflac / operations_shorthand_streaminfo.c

diff --git a/src/metaflac/operations_shorthand_streaminfo.c b/src/metaflac/operations_shorthand_streaminfo.c
index f9a277b..9912f7b 100644 (file)
--- a/src/metaflac/operations_shorthand_streaminfo.c
+++ b/src/metaflac/operations_shorthand_streaminfo.c
@@ -1,5 +1,5 @@
 /* metaflac - Command-line FLAC metadata editor
- * Copyright (C) 2001,2002,2003,2004  Josh Coalson
+ * Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,11 +16,17 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include "options.h"
 #include "utils.h"
 #include "FLAC/assert.h"
 #include "FLAC/metadata.h"
+#include "share/compat.h"
 #include <string.h>
+#include "operations_shorthand.h"
 
 FLAC__bool do_shorthand_operation__streaminfo(const char *filename, FLAC__bool prefix_with_filename, FLAC__Metadata_Chain *chain, const Operation *operation, FLAC__bool *needs_write)
 {
@@ -70,11 +76,7 @@ FLAC__bool do_shorthand_operation__streaminfo(const char *filename, FLAC__bool p
                        printf("%u\n", block->data.stream_info.bits_per_sample);
                        break;
                case OP__SHOW_TOTAL_SAMPLES:
-#ifdef _MSC_VER
-                       printf("%I64u\n", block->data.stream_info.total_samples);
-#else
-                       printf("%llu\n", block->data.stream_info.total_samples);
-#endif
+                       printf("%" PRIu64 "\n", block->data.stream_info.total_samples);
                        break;
                case OP__SET_MD5SUM:
                        memcpy(block->data.stream_info.md5sum, operation->argument.streaminfo_md5.value, 16);