Skip to content

Revert "Fix stlink on mingw64" - #573

Merged
xor-gate merged 3 commits into
masterfrom
revert-569-master
Mar 15, 2017
Merged

xor-gate merged 3 commits into
masterfrom
revert-569-master

Conversation

@xor-gate

Copy link
Copy Markdown
Contributor

Reverts #569
This breaks the build on other systems which is more correct than fixing the mingw64 build:

Issue introduced:

[ 37%] Building C object CMakeFiles/st-info.dir/src/tools/info.c.o
/var/lib/jenkins/jobs/GithubCI/jobs/stlink/workspace/src/tools/info.c: In function ‘print_data’:
/var/lib/jenkins/jobs/GithubCI/jobs/stlink/workspace/src/tools/info.c:117:9: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 2 has type ‘size_t’ [-Wformat=]
         printf("0x%x\n", sl->flash_size);
         ^
/var/lib/jenkins/jobs/GithubCI/jobs/stlink/workspace/src/tools/info.c:119:9: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 2 has type ‘size_t’ [-Wformat=]
         printf("0x%x\n", sl->sram_size);
         ^
/var/lib/jenkins/jobs/GithubCI/jobs/stlink/workspace/src/tools/info.c:121:9: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 2 has type ‘size_t’ [-Wformat=]
         printf("0x%x\n", sl->flash_pgsz);
         ^
Linking C executable st-info

@xor-gate
xor-gate merged commit c04df7f into master Mar 15, 2017
@xor-gate xor-gate mentioned this pull request Mar 15, 2017
@xor-gate
xor-gate deleted the revert-569-master branch April 5, 2017 18:48
@Nightwalker-87 Nightwalker-87 added this to the v1.4.0 milestone Mar 17, 2020
@stlink-org stlink-org locked as resolved and limited conversation to collaborators Apr 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants