X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=examples%2Fcapturewim.c;h=ae99acb4d5651151965799ab4f7fbfcaeabc8d7e;hp=2d89e51f4b7744e90268f0b2701400240d050363;hb=6fa3af89322f3bec1df1df7d283e76daca4a27e3;hpb=eb3e3b72db23ecaa7789a807afeb9577962653fe diff --git a/examples/capturewim.c b/examples/capturewim.c index 2d89e51f..ae99acb4 100644 --- a/examples/capturewim.c +++ b/examples/capturewim.c @@ -3,7 +3,7 @@ * * The following copying information applies to this specific source code file: * - * Written in 2014 by Eric Biggers + * Written in 2014-2016 by Eric Biggers * * To the extent possible under law, the author(s) have dedicated all copyright * and related and neighboring rights to this software to the public domain @@ -21,6 +21,21 @@ #include #include +/* + * Windows compatibility defines for string encoding. Applications using wimlib + * that need to run on both UNIX and Windows will need to do something similar + * to this, whereas applications that only need to run on one or the other can + * just use their platform's convention directly. + */ +#ifdef _WIN32 +# define main wmain + typedef wchar_t tchar; +# define TS "ls" +#else + typedef char tchar; +# define TS "s" +#endif + #define TO_PERCENT(numerator, denominator) \ ((float)(((denominator) == 0) ? 0 : ((numerator) * 100 / (float)(denominator)))) @@ -40,12 +55,12 @@ write_progress(enum wimlib_progress_msg msg, return WIMLIB_PROGRESS_STATUS_CONTINUE; } -int main(int argc, char **argv) +int main(int argc, tchar **argv) { int ret; WIMStruct *wim = NULL; - const char *srcdir; - const char *wimpath; + const tchar *srcdir; + const tchar *wimpath; /* Check for the correct number of arguments. */ if (argc != 3) { @@ -88,8 +103,8 @@ out: /* Check for error status. */ if (ret != 0) { - fprintf(stderr, "wimlib error %d: %s\n", - ret, wimlib_get_error_string(ret)); + fprintf(stderr, "wimlib error %d: %" TS"\n", + ret, wimlib_get_error_string((enum wimlib_error_code)ret)); } /* Free global memory (optional). */