UnGNUify the codebase

swaywm · Mar 11, 2017 · 9aed9d9 · 9aed9d9 · robotanarchy · Mar 19, 2017
1 parent 74d4f1b
commit 9aed9d9
Show file tree

Hide file tree

Showing 84 changed files with 123 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,9 +7,6 @@ set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_EXTENSIONS OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
-add_definitions(
-	-D_GNU_SOURCE
-	)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
@@ -70,14 +67,6 @@ find_package(PAM)
 
 find_package(LibInput REQUIRED)
 
-find_package(Backtrace)
-if(Backtrace_FOUND)
-	include_directories("${Backtrace_INCLUDE_DIRS}")
-	add_definitions(-DSWAY_Backtrace_FOUND=1)
-	set(LINK_LIBRARIES, "${LINK_LIBRARIES} ${Backtrace_LIBRARIES}")
-	set(SWAY_Backtrace_HEADER "${Backtrace_HEADER}")
-endif()
-
 if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
 	find_package(EpollShim REQUIRED)
 endif (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -13,10 +13,3 @@ add_library(sway-common STATIC
 	)
 
 target_link_libraries(sway-common m)
-
-if(Backtrace_FOUND)
-	set_target_properties(sway-common
-		PROPERTIES
-		COMPILE_FLAGS "-include ${Backtrace_HEADER}"
-		)
-endif()
diff --git a/common/ipc-client.c b/common/ipc-client.c
@@ -1,5 +1,6 @@
-#include <stdint.h>
+#define _POSIX_C_SOURCE 2
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>

diff --git a/common/log.c b/common/log.c
@@ -1,3 +1,4 @@
+#define _POSIX_C_SOURCE 1
 #include <errno.h>
 #include <libgen.h>
 #include <signal.h>

diff --git a/common/stringop.c b/common/stringop.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/common/util.c b/common/util.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc.h>
 #include <xkbcommon/xkbcommon-names.h>
 #include "log.h"

diff --git a/sway/commands.c b/sway/commands.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <xkbcommon/xkbcommon.h>
 #include <xkbcommon/xkbcommon-names.h>
 #include <wlc/wlc.h>

diff --git a/sway/commands/assign.c b/sway/commands/assign.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <stdio.h>
 #include <string.h>
 #include "sway/commands.h"

diff --git a/sway/commands/bar.c b/sway/commands/bar.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "log.h"

diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c
@@ -1,4 +1,6 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"

diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"

diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c
@@ -1,4 +1,6 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"

diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "list.h"

diff --git a/sway/commands/bar/pango_markup.c b/sway/commands/bar/pango_markup.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "log.h"

diff --git a/sway/commands/bar/strip_workspace_numbers.c b/sway/commands/bar/strip_workspace_numbers.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

diff --git a/sway/commands/bar/tray_padding.c b/sway/commands/bar/tray_padding.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

diff --git a/sway/commands/border.c b/sway/commands/border.c
@@ -1,6 +1,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 #include "sway/focus.h"

diff --git a/sway/commands/debuglog.c b/sway/commands/debuglog.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>

diff --git a/sway/commands/floating.c b/sway/commands/floating.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 #include "sway/ipc-server.h"

diff --git a/sway/commands/floating_mod.c b/sway/commands/floating_mod.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input_state.h"
 #include "list.h"

diff --git a/sway/commands/floating_scroll.c b/sway/commands/floating_scroll.c
@@ -1,4 +1,6 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 #include "stringop.h"

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc.h>
 #include "sway/commands.h"
 #include "sway/container.h"

diff --git a/sway/commands/focus_follows_mouse.c b/sway/commands/focus_follows_mouse.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_focus_follows_mouse(int argc, char **argv) {

diff --git a/sway/commands/font.c b/sway/commands/font.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/border.h"
 #include "sway/commands.h"

diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE 500
 #include <string.h>
 #include "sway/commands.h"
 #include "sway/criteria.h"

diff --git a/sway/commands/force_focus_wrapping.c b/sway/commands/force_focus_wrapping.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_force_focus_wrapping(int argc, char **argv) {

diff --git a/sway/commands/gaps.c b/sway/commands/gaps.c
@@ -2,6 +2,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 #include "sway/focus.h"

diff --git a/sway/commands/hide_edge_borders.c b/sway/commands/hide_edge_borders.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {

diff --git a/sway/commands/input.c b/sway/commands/input.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 #include "log.h"

diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 #include "log.h"

diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 #include "log.h"

diff --git a/sway/commands/input/left_handed.c b/sway/commands/input/left_handed.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 

diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/input.h"
 #include "log.h"

diff --git a/sway/commands/layout.c b/sway/commands/layout.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 #include "sway/layout.h"

diff --git a/sway/commands/log_colors.c b/sway/commands/log_colors.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "log.h"
 

diff --git a/sway/commands/mode.c b/sway/commands/mode.c
@@ -1,5 +1,7 @@
+#define _XOPEN_SOURCE 500
 #include <stdbool.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/ipc-server.h"

diff --git a/sway/commands/mouse_warping.c b/sway/commands/mouse_warping.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_mouse_warping(int argc, char **argv) {

diff --git a/sway/commands/move.c b/sway/commands/move.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc.h>
 #include "sway/commands.h"
 #include "sway/container.h"

diff --git a/sway/commands/new_float.c b/sway/commands/new_float.c
@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 

diff --git a/sway/commands/new_window.c b/sway/commands/new_window.c
@@ -1,5 +1,6 @@
 #include <errno.h>
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 #include "sway/container.h"
 

diff --git a/sway/commands/orientation.c b/sway/commands/orientation.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_orientation(int argc, char **argv) {

diff --git a/sway/commands/output.c b/sway/commands/output.c
@@ -1,7 +1,9 @@
+#define _XOPEN_SOURCE 500
 #include <ctype.h>
 #include <libgen.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <wordexp.h>
 #include "sway/commands.h"

diff --git a/sway/commands/resize.c b/sway/commands/resize.c
@@ -3,6 +3,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc.h>
 #include "sway/commands.h"
 #include "sway/layout.h"

diff --git a/sway/commands/scratchpad.c b/sway/commands/scratchpad.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include <wlc/wlc.h>
 #include "sway/commands.h"
 #include "sway/container.h"

diff --git a/sway/commands/seamless_mouse.c b/sway/commands/seamless_mouse.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include "sway/commands.h"
 
 struct cmd_results *cmd_seamless_mouse(int argc, char **argv) {