fenix/exhale
1
0
Fork 0
mirror of https://gitlab.com/ecodis/exhale.git synced 2025-06-05 21:59:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for Intel compiler

Browse Source
This commit is contained in:
Christian R. Helmrich
2020-06-13 19:00:10 +02:00
parent b83a3c489b
commit d280767f9b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/exhaleApp.cpp
View File

@@ -30,8 +30,8 @@
#include <share.h> #include <share.h>
#endif #endif
#define EXHALE_APP_WCHAR defined (_MSC_VER) || defined (__INTEL_COMPILER) || defined (__MINGW32__) #if defined (_MSC_VER) || defined (__INTEL_COMPILER) || defined (__MINGW32__)
#if EXHALE_APP_WCHAR #define EXHALE_APP_WCHAR
#define _SOPENS _wsopen_s #define _SOPENS _wsopen_s
#else #else
#define _SOPENS _sopen_s #define _SOPENS _sopen_s
@@ -53,7 +53,7 @@
#define XHE_AAC_LOW_DELAY 0 // 1: allow encoding with 768 frame length #define XHE_AAC_LOW_DELAY 0 // 1: allow encoding with 768 frame length
// main routine // main routine
#if EXHALE_APP_WCHAR #ifdef EXHALE_APP_WCHAR
int wmain (const int argc, wchar_t* argv[]) int wmain (const int argc, wchar_t* argv[])
#else #else
int main (const int argc, char* argv[]) int main (const int argc, char* argv[])
@@ -84,7 +84,7 @@ int main (const int argc, char* argv[])
if (argv[0][i] == '/' ) exePathEnd = i + 1; if (argv[0][i] == '/' ) exePathEnd = i + 1;
#endif #endif
} }
#if EXHALE_APP_WCHAR #ifdef EXHALE_APP_WCHAR
const wchar_t* const exeFileName = argv[0] + exePathEnd; const wchar_t* const exeFileName = argv[0] + exePathEnd;
#else #else
const char* const exeFileName = argv[0] + exePathEnd; const char* const exeFileName = argv[0] + exePathEnd;
@@ -97,7 +97,7 @@ int main (const int argc, char* argv[])
} }
// print program header with compile info in plain text if we pass -V // print program header with compile info in plain text if we pass -V
#if EXHALE_APP_WCHAR #ifdef EXHALE_APP_WCHAR
if ((argc > 1) && (wcscmp (argv[1], L"-V") == 0 || wcscmp (argv[1], L"-v") == 0)) if ((argc > 1) && (wcscmp (argv[1], L"-V") == 0 || wcscmp (argv[1], L"-v") == 0))
#else #else
if ((argc > 1) && (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "-v") == 0)) if ((argc > 1) && (strcmp (argv[1], "-V") == 0 || strcmp (argv[1], "-v") == 0))
@@ -109,7 +109,7 @@ int main (const int argc, char* argv[])
fprintf_s (stdout, "exhale %s.%s%s (x86", fprintf_s (stdout, "exhale %s.%s%s (x86",
#endif #endif
EXHALELIB_VERSION_MAJOR, EXHALELIB_VERSION_MINOR, EXHALELIB_VERSION_BUGFIX); EXHALELIB_VERSION_MAJOR, EXHALELIB_VERSION_MINOR, EXHALELIB_VERSION_BUGFIX);
#if EXHALE_APP_WCHAR #ifdef EXHALE_APP_WCHAR
if (wcscmp (argv[1], L"-V") == 0) if (wcscmp (argv[1], L"-V") == 0)
#else #else
if (strcmp (argv[1], "-V") == 0) if (strcmp (argv[1], "-V") == 0)
@@ -117,7 +117,7 @@ int main (const int argc, char* argv[])
{ {
char fts[] = __TIMESTAMP__; // append month and year of file time char fts[] = __TIMESTAMP__; // append month and year of file time
fts[7] = 0; fts[7] = 0;
#if EXHALE_APP_WCHAR #ifdef EXHALE_APP_WCHAR
fprintf_s (stdout, ", Unicode"); fprintf_s (stdout, ", Unicode");
#endif #endif
fprintf_s (stdout, ", %s %s)\n", &fts[4], &fts[sizeof (fts) - 5]); fprintf_s (stdout, ", %s %s)\n", &fts[4], &fts[sizeof (fts) - 5]);
@@ -264,7 +264,7 @@ int main (const int argc, char* argv[])
} }
else // argc = 4, open input file else // argc = 4, open input file
{ {
#if EXHALE_APP_WCHAR #ifdef EXHALE_APP_WCHAR
const wchar_t* inFileName = argv[2]; const wchar_t* inFileName = argv[2];
#else #else
const char* inFileName = argv[2]; const char* inFileName = argv[2];
@@ -288,7 +288,7 @@ int main (const int argc, char* argv[])
if (inPathEnd == 0) // name has no path if (inPathEnd == 0) // name has no path
{ {
#if EXHALE_APP_WCHAR #ifdef EXHALE_APP_WCHAR
inFileName = (const wchar_t*) malloc ((exePathEnd + i + 1) * sizeof (wchar_t)); // 0-terminated inFileName = (const wchar_t*) malloc ((exePathEnd + i + 1) * sizeof (wchar_t)); // 0-terminated
memcpy ((void*) inFileName, argv[0], exePathEnd * sizeof (wchar_t)); // prepend executable path memcpy ((void*) inFileName, argv[0], exePathEnd * sizeof (wchar_t)); // prepend executable path
memcpy ((void*)(inFileName + exePathEnd), argv[2], (i + 1) * sizeof (wchar_t)); // to file name memcpy ((void*)(inFileName + exePathEnd), argv[2], (i + 1) * sizeof (wchar_t)); // to file name
@@ -328,7 +328,7 @@ int main (const int argc, char* argv[])
} }
else // WAVE OK, open output file else // WAVE OK, open output file
{ {
#if EXHALE_APP_WCHAR #ifdef EXHALE_APP_WCHAR
const wchar_t* outFileName = argv[argc - 1]; const wchar_t* outFileName = argv[argc - 1];
#else #else
const char* outFileName = argv[argc - 1]; const char* outFileName = argv[argc - 1];
@@ -361,7 +361,7 @@ int main (const int argc, char* argv[])
if (outPathEnd == 0) // name has no path if (outPathEnd == 0) // name has no path
{ {
#if EXHALE_APP_WCHAR #ifdef EXHALE_APP_WCHAR
outFileName = (const wchar_t*) malloc ((exePathEnd + i + 1) * sizeof (wchar_t)); // 0-terminated outFileName = (const wchar_t*) malloc ((exePathEnd + i + 1) * sizeof (wchar_t)); // 0-terminated
memcpy ((void*) outFileName, argv[0], exePathEnd * sizeof (wchar_t)); // prepend executable path memcpy ((void*) outFileName, argv[0], exePathEnd * sizeof (wchar_t)); // prepend executable path
memcpy ((void*)(outFileName + exePathEnd), argv[argc - 1], (i + 1) * sizeof (wchar_t));// to name memcpy ((void*)(outFileName + exePathEnd), argv[argc - 1], (i + 1) * sizeof (wchar_t));// to name