diff options
| author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-09-27 14:00:57 +0200 |
|---|---|---|
| committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-09-27 14:00:57 +0200 |
| commit | a78f7bbfcdabad9550afe22f615b973b92cb074f (patch) | |
| tree | 318e888219965634e3b81be9b74a0522af2136e0 /mwe/dynlink | |
| parent | 86a7bd1aee2ee96079e00e2696a624fd6b642fa0 (diff) | |
| parent | f4560e02f703f1c6f857c8e5af63fa9fc4ca6438 (diff) | |
fixed merge conflict
Diffstat (limited to 'mwe/dynlink')
| -rw-r--r-- | mwe/dynlink/exec/main.c | 1 | ||||
| -rw-r--r-- | mwe/dynlink/exec/makefile | 1 | ||||
| -rw-r--r-- | mwe/dynlink/lib/lib.c | 5 | ||||
| -rw-r--r-- | mwe/dynlink/lib/lib.h | 1 | ||||
| -rw-r--r-- | mwe/dynlink/lib/makefile | 1 |
5 files changed, 1 insertions, 8 deletions
diff --git a/mwe/dynlink/exec/main.c b/mwe/dynlink/exec/main.c index e3f458a..2bbdc20 100644 --- a/mwe/dynlink/exec/main.c +++ b/mwe/dynlink/exec/main.c @@ -5,4 +5,3 @@ int main() { return 0; } - diff --git a/mwe/dynlink/exec/makefile b/mwe/dynlink/exec/makefile deleted file mode 100644 index eec7c61..0000000 --- a/mwe/dynlink/exec/makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../../lazy.mk diff --git a/mwe/dynlink/lib/lib.c b/mwe/dynlink/lib/lib.c index 930e403..c7a78e4 100644 --- a/mwe/dynlink/lib/lib.c +++ b/mwe/dynlink/lib/lib.c @@ -1,6 +1,3 @@ #include <stdio.h> -void library_function() { - printf("%s\n", __PRETTY_FUNCTION__); -} - +void library_function() { printf("%s\n", __PRETTY_FUNCTION__); } diff --git a/mwe/dynlink/lib/lib.h b/mwe/dynlink/lib/lib.h index 068f07d..093eadb 100644 --- a/mwe/dynlink/lib/lib.h +++ b/mwe/dynlink/lib/lib.h @@ -1,4 +1,3 @@ #pragma once void library_function(); - diff --git a/mwe/dynlink/lib/makefile b/mwe/dynlink/lib/makefile deleted file mode 100644 index eec7c61..0000000 --- a/mwe/dynlink/lib/makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../../lazy.mk |