summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2020-08-04 21:17:43 +0200
committerAndreas Kling <kling@serenityos.org>2020-08-04 21:17:43 +0200
commit984683cf34ee471bfbd2e0d3eca3517d0c2dce97 (patch)
tree211f7992cf00c049c741a9a5c31470a7c07b46b8
parent000ef0ec3d0025753a545f14705e0046f92f4875 (diff)
downloadserenity-984683cf34ee471bfbd2e0d3eca3517d0c2dce97.zip
Revert "LibM: Always include <math.h> instead of <LibM/math.h>"
This reverts commit dc12cbca41b8b667ae7ced1066647d47186d1557. Sadly this broke the build due to some confusion about <new>. Reverting until this can be solved fully.
-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--Libraries/LibGfx/FloatPoint.h2
-rw-r--r--Libraries/LibGfx/GIFLoader.cpp4
-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
16 files changed, 17 insertions, 17 deletions
diff --git a/Applications/PixelPaint/EllipseTool.cpp b/Applications/PixelPaint/EllipseTool.cpp
index e4914f03b2..bdad687e65 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 <math.h>
+#include <LibM/math.h>
namespace PixelPaint {
diff --git a/Applications/PixelPaint/LineTool.cpp b/Applications/PixelPaint/LineTool.cpp
index 8dd2d0a4f1..dd1133aa77 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 <math.h>
+#include <LibM/math.h>
namespace PixelPaint {
diff --git a/Applications/PixelPaint/RectangleTool.cpp b/Applications/PixelPaint/RectangleTool.cpp
index 4eaffd29bb..84d5e3937e 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 <math.h>
+#include <LibM/math.h>
namespace PixelPaint {
diff --git a/Applications/PixelPaint/SprayTool.cpp b/Applications/PixelPaint/SprayTool.cpp
index 85a6200f97..0a685e36e0 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 <math.h>
+#include <LibM/math.h>
#include <stdio.h>
namespace PixelPaint {
diff --git a/Applications/SoundPlayer/SampleWidget.cpp b/Applications/SoundPlayer/SampleWidget.cpp
index b3884a175a..5decd2b8b9 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 <math.h>
+#include <LibM/math.h>
SampleWidget::SampleWidget()
{
diff --git a/Applications/SoundPlayer/SoundPlayerWidget.cpp b/Applications/SoundPlayer/SoundPlayerWidget.cpp
index 5901283581..0b416c0833 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 <math.h>
+#include <LibM/math.h>
SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtr<Audio::ClientConnection> connection)
: m_window(window)
diff --git a/Libraries/LibGfx/FloatPoint.h b/Libraries/LibGfx/FloatPoint.h
index 3cfa7103a5..59b10a06c0 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 <math.h>
+#include <LibM/math.h>
namespace Gfx {
diff --git a/Libraries/LibGfx/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp
index 264175e58d..a7e3f89407 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 <math.h>
+#include <LibM/math.h>
#include <stdio.h>
#include <string.h>
@@ -546,7 +546,7 @@ GIFImageDecoderPlugin::GIFImageDecoderPlugin(const u8* data, size_t size)
m_context->data_size = size;
}
-GIFImageDecoderPlugin::~GIFImageDecoderPlugin() { }
+GIFImageDecoderPlugin::~GIFImageDecoderPlugin() {}
IntSize GIFImageDecoderPlugin::size()
{
diff --git a/Libraries/LibGfx/ICOLoader.cpp b/Libraries/LibGfx/ICOLoader.cpp
index c75aae04b2..3026ce0f9d 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 <math.h>
+#include <LibM/math.h>
#include <stdio.h>
#include <string.h>
diff --git a/Libraries/LibGfx/JPGLoader.cpp b/Libraries/LibGfx/JPGLoader.cpp
index c7b40c8d2b..57772534d2 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 <math.h>
+#include <Libraries/LibM/math.h>
#define JPG_DBG 0
#define jpg_dbg(x) \
diff --git a/Libraries/LibGfx/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp
index b4743d4bb4..e732ac2e24 100644
--- a/Libraries/LibGfx/PNGLoader.cpp
+++ b/Libraries/LibGfx/PNGLoader.cpp
@@ -30,7 +30,7 @@
#include <AK/NetworkOrdered.h>
#include <LibCore/puff.h>
#include <LibGfx/PNGLoader.h>
-#include <math.h>
+#include <LibM/math.h>
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
diff --git a/Libraries/LibGfx/Point.h b/Libraries/LibGfx/Point.h
index 9603625ef8..9ba78a9744 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 <math.h>
+#include <LibM/math.h>
#include <stdlib.h>
namespace Gfx {
diff --git a/Libraries/LibGfx/Rect.h b/Libraries/LibGfx/Rect.h
index 6105491f82..94d133d846 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 <math.h>
+#include <LibM/math.h>
namespace Gfx {
diff --git a/Libraries/LibM/math.cpp b/Libraries/LibM/math.cpp
index 9d98d8439b..d83dbecd64 100644
--- a/Libraries/LibM/math.cpp
+++ b/Libraries/LibM/math.cpp
@@ -25,7 +25,7 @@
*/
#include <LibC/assert.h>
-#include <math.h>
+#include <LibM/math.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/Userland/du.cpp b/Userland/du.cpp
index 65352af28e..475f2004a8 100644
--- a/Userland/du.cpp
+++ b/Userland/du.cpp
@@ -33,7 +33,7 @@
#include <LibCore/DirIterator.h>
#include <LibCore/File.h>
#include <LibCore/Object.h>
-#include <math.h>
+#include <LibM/math.h>
#include <limits.h>
#include <stdio.h>
#include <string.h>
diff --git a/Userland/functrace.cpp b/Userland/functrace.cpp
index 53b714e483..69a5283068 100644
--- a/Userland/functrace.cpp
+++ b/Userland/functrace.cpp
@@ -38,7 +38,7 @@
#include <LibCore/File.h>
#include <LibDebug/DebugSession.h>
#include <LibELF/Image.h>
-#include <math.h>
+#include <LibM/math.h>
#include <LibX86/Disassembler.h>
#include <LibX86/Instruction.h>
#include <signal.h>