From ea0d06c0587b03c20ef02c5952fb9cada338d3e0 Mon Sep 17 00:00:00 2001 From: VIliam Date: Fri, 31 Jan 2025 19:26:10 +0100 Subject: [PATCH] skuska2 --- sk2/Makefile | 2 +- sk2/calculator.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sk2/Makefile b/sk2/Makefile index a433323..b564c50 100644 --- a/sk2/Makefile +++ b/sk2/Makefile @@ -4,7 +4,7 @@ OBJ=main.o calculator.o all: calculator -kalkulacka: $(OBJ) +calculator: $(OBJ) $(CC) $(CFLAGS) -o calculator $(OBJ) -lm main.o: main.c calculator.h diff --git a/sk2/calculator.c b/sk2/calculator.c index 3090755..eacdf34 100644 --- a/sk2/calculator.c +++ b/sk2/calculator.c @@ -29,7 +29,7 @@ double del(double a, double b) { return a / b; } double sin(double x) { return sin(x); } double cos(double x) { return cos(x); } double sqrt(double x) { return sqrt(x); } -double pow(double zaklad, double exponent) { return pow(zaklad, exponent); } +double mocnina(double zaklad, double exponent) { return pow(zaklad, exponent); } double log(double x) { return log(x); } // Funkcia na konverziu infixového výrazu na postfixový (Shunting-yard algoritmus)