diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /news/pan/files/patch-pan_tasks_socket-impl-main.cc | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'news/pan/files/patch-pan_tasks_socket-impl-main.cc')
| -rw-r--r-- | news/pan/files/patch-pan_tasks_socket-impl-main.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/news/pan/files/patch-pan_tasks_socket-impl-main.cc b/news/pan/files/patch-pan_tasks_socket-impl-main.cc deleted file mode 100644 index f7c62379eb79..000000000000 --- a/news/pan/files/patch-pan_tasks_socket-impl-main.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- pan/tasks/socket-impl-main.cc.orig 2021-08-03 02:06:37 UTC -+++ pan/tasks/socket-impl-main.cc -@@ -30,10 +30,7 @@ - //#include <glib/giochannel.h> - //#include <glib/gstring.h> - --extern "C" --{ -- #include <glib.h> --} -+#include <glib.h> - - #include <pan/tasks/socket.h> - |