flactimer patches from Janne Hyvärinen <cse@sci.fi>.

diff --git a/src/utils/flactimer/flactimer.vcproj b/src/utils/flactimer/flactimer.vcproj
index 3011f15..4496fa2 100644 (file)
--- a/src/utils/flactimer/flactimer.vcproj
+++ b/src/utils/flactimer/flactimer.vcproj
@@ -39,7 +39,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="."\r
+                               AdditionalIncludeDirectories=".;..\..\..\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DEBUG"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -116,7 +116,7 @@
                                FavorSizeOrSpeed="1"\r
                                OmitFramePointers="true"\r
                                WholeProgramOptimization="true"\r
-                               AdditionalIncludeDirectories="."\r
+                               AdditionalIncludeDirectories=".;..\..\..\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
@@ -195,7 +195,7 @@
                                FavorSizeOrSpeed="1"\r
                                OmitFramePointers="true"\r
                                WholeProgramOptimization="true"\r
-                               AdditionalIncludeDirectories="."\r
+                               AdditionalIncludeDirectories=".;..\..\..\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"\r
                                RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r

diff --git a/src/utils/flactimer/main.cpp b/src/utils/flactimer/main.cpp
index 068d518..85e8a33 100644 (file)
--- a/src/utils/flactimer/main.cpp
+++ b/src/utils/flactimer/main.cpp
@@ -19,6 +19,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <windows.h>
+#include "share/compat.h"
+#include "share/safe_str.h"
 
 #define int64_t __int64
 #define uint64_t unsigned int64_t
@@ -106,8 +108,8 @@ int main(int argc, char *argv[])
        args[0] = '\0';
        for(i = 0; i < argc; i++) {
                if(i > 0)
-                       safe_strncat(args, sizeof(args), " ");
-               safe_strncat(args, sizeof(args), argv[i]);
+                       safe_strncat(args, " ", sizeof(args));
+               safe_strncat(args, argv[i], sizeof(args));
        }
 
        //fprintf(stderr, "@@@ cmd=[%s] args=[%s]\n", argv[0], args);