maint: remove useless definitions

* libparted/fs/xfs/platform_defs.h [__sparc__] (O_DIRECT):
Remove now-unneeded definition.
* parted/table.c (wchar_t): Remove definition.
* parted/strlist.c (wchar_t): Likewise.
* .x-sc_prohibit_always-defined_macros: New file.
Exempt two files from this syntax-check rule.
* Makefile.am (EXTRA_DIST): Add it here.

diff --git a/.x-sc_prohibit_always-defined_macros b/.x-sc_prohibit_always-defined_macros
new file mode 100644 (file)
index 0000000..3590338
--- /dev/null
+++ b/.x-sc_prohibit_always-defined_macros
@@ -0,0 +1,2 @@
+^parted/strlist\.h$
+^parted/table\.h$

diff --git a/Makefile.am b/Makefile.am
index d5a32ef..70ca26b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ EXTRA_DIST =                            \
   parted.spec.in                       \
   parted.spec                          \
   .x-sc_GPL_version                    \
+  .x-sc_prohibit_always-defined_macros \
   scripts/data/abi/baseline_symbols.txt \
   scripts/extract_symvers              \
   cfg.mk                               \

diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h
index 16ba1c5..2b55752 100644 (file)
--- a/libparted/fs/xfs/platform_defs.h
+++ b/libparted/fs/xfs/platform_defs.h
@@ -51,12 +51,6 @@
 # define constpp       char * const *
 #endif
 
-#ifdef __sparc__
-# ifndef O_DIRECT
-#  define O_DIRECT     0x100000
-# endif
-#endif
-
 typedef loff_t         xfs_off_t;
 typedef uint64_t       xfs_ino_t;
 typedef uint32_t       xfs_dev_t;

diff --git a/parted/strlist.c b/parted/strlist.c
index 310ff01..e20dc04 100644 (file)
--- a/parted/strlist.c
+++ b/parted/strlist.c
@@ -38,14 +38,6 @@
 #include <wchar.h>
 #include <wctype.h>
 
-#else /* ENABLE_NLS */
-
-#ifdef wchar_t
-#undef wchar_t
-#endif
-
-#define wchar_t char
-
 #endif /* !ENABLE_NLS */
 
 #include "strlist.h"

diff --git a/parted/table.c b/parted/table.c
index 48202dd..d184a5f 100644 (file)
--- a/parted/table.c
+++ b/parted/table.c
@@ -36,10 +36,6 @@
 #      define L_(str) L##str
 #else
 #      define L_(str) str
-#       ifdef wchar_t
-#               undef wchar_t
-#       endif
-#       define wchar_t char
 #       define wcslen strlen
 #       define wcswidth strnlen
 #       define wcscat strcat