Merge remote-tracking branch 'origin/master' into develop

tests/test_common/test_matrix.h

@@ -14,8 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TESTS_TEST_COMMON_TEST_MATRIX_H_
-#define TESTS_TEST_COMMON_TEST_MATRIX_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,5 +27,3 @@ void clear_all_keys(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* TESTS_TEST_COMMON_TEST_MATRIX_H_ */

tmk_core/make_dfu_header.sh

@@ -3,8 +3,7 @@ ALL_CONFIGS=$*
 GREP="grep"
 
 cat <<- EOF > lib/lufa/Bootloaders/DFU/Keyboard.h
-#ifndef QMK_KEYBOARD
-#define QMK_KEYBOARD
+#pragma once
 
 $($GREP "MANUFACTURER[ \t]" $ALL_CONFIGS -h | tail -1)
 $($GREP "PRODUCT[ \t]" $ALL_CONFIGS -h | tail -1 | tr -d '\r') Bootloader
@@ -12,5 +11,4 @@ $($GREP "QMK_ESC_OUTPUT[ \t]" $ALL_CONFIGS -h | tail -1)
 $($GREP "QMK_ESC_INPUT[ \t]" $ALL_CONFIGS -h | tail -1)
 $($GREP "QMK_LED[ \t]" $ALL_CONFIGS -h | tail -1)
 $($GREP "QMK_SPEAKER[ \t]" $ALL_CONFIGS -h | tail -1)
-#endif
 EOF