summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Groh <mail@linusgroh.de>2020-08-12 10:44:45 +0200
committerAndreas Kling <kling@serenityos.org>2020-08-12 16:18:33 +0200
commit7072806234aae471dc0d824b86352f85a73f88be (patch)
tree191a01f73580382165973de774d0da8d65fd08a9
parent7390098adcfae38d7d313d5f2f5eca9b4462463e (diff)
downloadserenity-7072806234aae471dc0d824b86352f85a73f88be.zip
Meta: Replace remaining LibM/math.h includes with math.h
-rw-r--r--Applications/PixelPaint/EllipseTool.cpp2
-rw-r--r--Applications/PixelPaint/LineTool.cpp2
-rw-r--r--Applications/PixelPaint/RectangleTool.cpp2
-rw-r--r--Applications/PixelPaint/SprayTool.cpp2
-rw-r--r--Applications/SoundPlayer/SampleWidget.cpp2
-rw-r--r--Applications/SoundPlayer/SoundPlayerWidget.cpp2
-rw-r--r--CMakeLists.txt1
-rw-r--r--Libraries/LibGfx/FloatPoint.h2
-rw-r--r--Libraries/LibGfx/GIFLoader.cpp2
-rw-r--r--Libraries/LibGfx/ICOLoader.cpp2
-rw-r--r--Libraries/LibGfx/JPGLoader.cpp2
-rw-r--r--Libraries/LibGfx/PNGLoader.cpp2
-rw-r--r--Libraries/LibGfx/Point.h2
-rw-r--r--Libraries/LibGfx/Rect.h2
-rw-r--r--Libraries/LibM/math.cpp2
-rw-r--r--Userland/du.cpp2
-rw-r--r--Userland/functrace.cpp2
17 files changed, 17 insertions, 16 deletions
diff --git a/Applications/PixelPaint/EllipseTool.cpp b/Applications/PixelPaint/EllipseTool.cpp
index bdad687e65..e4914f03b2 100644
--- a/Applications/PixelPaint/EllipseTool.cpp
+++ b/Applications/PixelPaint/EllipseTool.cpp
@@ -31,7 +31,7 @@
#include <LibGUI/Menu.h>
#include <LibGUI/Painter.h>
#include <LibGfx/Rect.h>
-#include <LibM/math.h>
+#include <math.h>
namespace PixelPaint {
diff --git a/Applications/PixelPaint/LineTool.cpp b/Applications/PixelPaint/LineTool.cpp
index dd1133aa77..8dd2d0a4f1 100644
--- a/Applications/PixelPaint/LineTool.cpp
+++ b/Applications/PixelPaint/LineTool.cpp
@@ -30,7 +30,7 @@
#include <LibGUI/Action.h>
#include <LibGUI/Menu.h>
#include <LibGUI/Painter.h>
-#include <LibM/math.h>
+#include <math.h>
namespace PixelPaint {
diff --git a/Applications/PixelPaint/RectangleTool.cpp b/Applications/PixelPaint/RectangleTool.cpp
index 84d5e3937e..4eaffd29bb 100644
--- a/Applications/PixelPaint/RectangleTool.cpp
+++ b/Applications/PixelPaint/RectangleTool.cpp
@@ -31,7 +31,7 @@
#include <LibGUI/Menu.h>
#include <LibGUI/Painter.h>
#include <LibGfx/Rect.h>
-#include <LibM/math.h>
+#include <math.h>
namespace PixelPaint {
diff --git a/Applications/PixelPaint/SprayTool.cpp b/Applications/PixelPaint/SprayTool.cpp
index 0a685e36e0..85a6200f97 100644
--- a/Applications/PixelPaint/SprayTool.cpp
+++ b/Applications/PixelPaint/SprayTool.cpp
@@ -33,7 +33,7 @@
#include <LibGUI/Menu.h>
#include <LibGUI/Painter.h>
#include <LibGfx/Bitmap.h>
-#include <LibM/math.h>
+#include <math.h>
#include <stdio.h>
namespace PixelPaint {
diff --git a/Applications/SoundPlayer/SampleWidget.cpp b/Applications/SoundPlayer/SampleWidget.cpp
index 5decd2b8b9..b3884a175a 100644
--- a/Applications/SoundPlayer/SampleWidget.cpp
+++ b/Applications/SoundPlayer/SampleWidget.cpp
@@ -27,7 +27,7 @@
#include "SampleWidget.h"
#include <LibAudio/Buffer.h>
#include <LibGUI/Painter.h>
-#include <LibM/math.h>
+#include <math.h>
SampleWidget::SampleWidget()
{
diff --git a/Applications/SoundPlayer/SoundPlayerWidget.cpp b/Applications/SoundPlayer/SoundPlayerWidget.cpp
index 0b416c0833..5901283581 100644
--- a/Applications/SoundPlayer/SoundPlayerWidget.cpp
+++ b/Applications/SoundPlayer/SoundPlayerWidget.cpp
@@ -30,7 +30,7 @@
#include <LibGUI/Button.h>
#include <LibGUI/Label.h>
#include <LibGUI/MessageBox.h>
-#include <LibM/math.h>
+#include <math.h>
SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtr<Audio::ClientConnection> connection)
: m_window(window)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e44e8bb6c..279188baa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,6 +157,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG -DSANITIZE_PTRS")
add_link_options(--sysroot ${CMAKE_BINARY_DIR}/Root)
include_directories(Libraries/LibC)
+include_directories(Libraries/LibM)
include_directories(Services)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/Services)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/Libraries)
diff --git a/Libraries/LibGfx/FloatPoint.h b/Libraries/LibGfx/FloatPoint.h
index 59b10a06c0..3cfa7103a5 100644
--- a/Libraries/LibGfx/FloatPoint.h
+++ b/Libraries/LibGfx/FloatPoint.h
@@ -30,7 +30,7 @@
#include <AK/String.h>
#include <LibGfx/Orientation.h>
#include <LibGfx/Point.h>
-#include <LibM/math.h>
+#include <math.h>
namespace Gfx {
diff --git a/Libraries/LibGfx/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp
index 471b258a17..5a3d1032ca 100644
--- a/Libraries/LibGfx/GIFLoader.cpp
+++ b/Libraries/LibGfx/GIFLoader.cpp
@@ -30,7 +30,7 @@
#include <AK/MappedFile.h>
#include <AK/NonnullOwnPtrVector.h>
#include <LibGfx/GIFLoader.h>
-#include <LibM/math.h>
+#include <math.h>
#include <stdio.h>
#include <string.h>
diff --git a/Libraries/LibGfx/ICOLoader.cpp b/Libraries/LibGfx/ICOLoader.cpp
index 8a93d49d0d..0eb251ddb1 100644
--- a/Libraries/LibGfx/ICOLoader.cpp
+++ b/Libraries/LibGfx/ICOLoader.cpp
@@ -32,7 +32,7 @@
#include <AK/Types.h>
#include <LibGfx/ICOLoader.h>
#include <LibGfx/PNGLoader.h>
-#include <LibM/math.h>
+#include <math.h>
#include <stdio.h>
#include <string.h>
diff --git a/Libraries/LibGfx/JPGLoader.cpp b/Libraries/LibGfx/JPGLoader.cpp
index 122f3ee17c..f21d8de793 100644
--- a/Libraries/LibGfx/JPGLoader.cpp
+++ b/Libraries/LibGfx/JPGLoader.cpp
@@ -33,7 +33,7 @@
#include <AK/Vector.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/JPGLoader.h>
-#include <Libraries/LibM/math.h>
+#include <math.h>
#define JPG_DBG 0
#define jpg_dbg(x) \
diff --git a/Libraries/LibGfx/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp
index 47f0ff9994..434047573c 100644
--- a/Libraries/LibGfx/PNGLoader.cpp
+++ b/Libraries/LibGfx/PNGLoader.cpp
@@ -30,8 +30,8 @@
#include <AK/NetworkOrdered.h>
#include <LibCore/puff.h>
#include <LibGfx/PNGLoader.h>
-#include <LibM/math.h>
#include <fcntl.h>
+#include <math.h>
#include <stdio.h>
#include <string.h>
#include <sys/mman.h>
diff --git a/Libraries/LibGfx/Point.h b/Libraries/LibGfx/Point.h
index 9ba78a9744..9603625ef8 100644
--- a/Libraries/LibGfx/Point.h
+++ b/Libraries/LibGfx/Point.h
@@ -31,7 +31,7 @@
#include <LibGfx/Orientation.h>
#include <LibGfx/Forward.h>
#include <LibIPC/Forward.h>
-#include <LibM/math.h>
+#include <math.h>
#include <stdlib.h>
namespace Gfx {
diff --git a/Libraries/LibGfx/Rect.h b/Libraries/LibGfx/Rect.h
index 94d133d846..6105491f82 100644
--- a/Libraries/LibGfx/Rect.h
+++ b/Libraries/LibGfx/Rect.h
@@ -30,7 +30,7 @@
#include <LibGfx/Point.h>
#include <LibGfx/Size.h>
#include <LibGfx/TextAlignment.h>
-#include <LibM/math.h>
+#include <math.h>
namespace Gfx {
diff --git a/Libraries/LibM/math.cpp b/Libraries/LibM/math.cpp
index d83dbecd64..9d98d8439b 100644
--- a/Libraries/LibM/math.cpp
+++ b/Libraries/LibM/math.cpp
@@ -25,7 +25,7 @@
*/
#include <LibC/assert.h>
-#include <LibM/math.h>
+#include <math.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/Userland/du.cpp b/Userland/du.cpp
index 475f2004a8..bd3daa3d82 100644
--- a/Userland/du.cpp
+++ b/Userland/du.cpp
@@ -33,8 +33,8 @@
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
#include <LibCore/Object.h>
-#include <LibM/math.h>
#include <limits.h>
+#include <math.h>
#include <stdio.h>
#include <string.h>
#include <sys/stat.h>
diff --git a/Userland/functrace.cpp b/Userland/functrace.cpp
index 69a5283068..b431a4fbe3 100644
--- a/Userland/functrace.cpp
+++ b/Userland/functrace.cpp
@@ -38,9 +38,9 @@
#include <LibCore/File.h>
#include <LibDebug/DebugSession.h>
#include <LibELF/Image.h>
-#include <LibM/math.h>
#include <LibX86/Disassembler.h>
#include <LibX86/Instruction.h>
+#include <math.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>