Move symbol definitions from source files to Makefile.

PATCH In review Artur Wojcik 3 participants 5 messages Jan 28, 2010 – Jan 29, 2010

Subsystems (2)

Kbuild MD RAID

lore

Share & tools

lore

Artur Wojcik

author

2010-01-28 15:47 UTC #0 lore raw

PATCH 1/1 Move symbol definitions from source files to Makefile.

This patch will move _GNU_SOURCE and _FILE_OFFSET_BITS=64 from various source files to Makefile.

Signed-off-by Artur Wojcik <[email protected]>

---
 Makefile    |   10 +++++++---
 managemon.c |    3 ---
 mdadm.h     |    2 --
 mdmon.c     |    4 ----
 msg.c       |    3 ---
 5 files changed, 7 insertions(+), 15 deletions(-)

Makefile +7 -3

index deb6c34..901b3e0 100644
@@ -47,10 +47,14 @@ ifdef WARN_UNUSED
 CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
 endif
 
+CPPFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+
 ifdef DEBIAN
-CPPFLAGS= -DDEBIAN
-else
-CPPFLAGS=
+CPPFLAGS += -DDEBIAN
+endif
+
+ifdef DEBUG
+CPPFLAGS += -DDEBUG
 endif
 
 SYSCONFDIR = /etc

managemon.c +0 -3

index 47ed892..31809b6 100644
@@ -99,9 +99,6 @@
  * - Watch for change in raid-disks, chunk-size, etc.  Update metadata and
  *   start a reshape.
  */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include	"mdadm.h"
 #include	"mdmon.h"
 #include	<sys/syscall.h>

mdadm.h +0 -2

index 4f193a8..2ea0175 100644
@@ -22,8 +22,6 @@
  *    Email: <[email protected]>
  */
 
-#define	_GNU_SOURCE
-#define _FILE_OFFSET_BITS 64
 #include	<unistd.h>
 #if !defined(__dietlibc__) && !defined(__KLIBC__)
 extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));

mdmon.c +0 -4

index 0ec4259..e378ffe 100644
@@ -39,10 +39,6 @@
  *
  */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #include	<unistd.h>
 #include	<stdlib.h>
 #include	<sys/types.h>

msg.c +0 -3

index 8d52b94..7390fcb 100644
@@ -16,9 +16,6 @@
  * this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>

Andre Noll

2010-01-28 17:02 UTC #1 lore raw

Quoted 2 lines · Artur Wojcik

This patch will move _GNU_SOURCE and _FILE_OFFSET_BITS=64 from various source files to Makefile.

That's fine by me, but let's see what Neil has to say about this.

While cleaning up the #defines, we might want to get rid of a couple of unused ones at the same time. BLKPG_ADD_PARTITION, START_MD, REGISTER_DEV, MD_FEATURE_ALL, STDC, OF seem to be good candidates for removal.

There are also quite some unused defines in super-ddf.c and super-intel.c, presumably because these files contain code that was copied from somewhere else. I'm not sure if it is worth to kill these as well though.

Thanks
Andre

Signature · 1 line

The only person who always got his work done by Friday was Robinson Crusoe

Neil Brown

2010-01-29 09:45 UTC #2 lore raw

In reply to Artur Wojcik

Quoted 2 lines · On Thu, 28 Jan 2010 16:47:45 +0100 Artur Wojcik <[email protected]> wrote:

This patch will move _GNU_SOURCE and _FILE_OFFSET_BITS=64 from various source files to Makefile.

Why?

NeilBrown

Quoted 93 lines

Signed-off-by Artur Wojcik <[email protected]>

---
 Makefile    |   10 +++++++---
 managemon.c |    3 ---
 mdadm.h     |    2 --
 mdmon.c     |    4 ----
 msg.c       |    3 ---
 5 files changed, 7 insertions(+), 15 deletions(-)

Makefile +7 -3

index deb6c34..901b3e0 100644
@@ -47,10 +47,14 @@ ifdef WARN_UNUSED
 CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
 endif
 
+CPPFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+
 ifdef DEBIAN
-CPPFLAGS= -DDEBIAN
-else
-CPPFLAGS=
+CPPFLAGS += -DDEBIAN
+endif
+
+ifdef DEBUG
+CPPFLAGS += -DDEBUG
 endif
 
 SYSCONFDIR = /etc

managemon.c +0 -3

index 47ed892..31809b6 100644
@@ -99,9 +99,6 @@
  * - Watch for change in raid-disks, chunk-size, etc.  Update metadata and
  *   start a reshape.
  */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include	"mdadm.h"
 #include	"mdmon.h"
 #include	<sys/syscall.h>

mdadm.h +0 -2

index 4f193a8..2ea0175 100644
@@ -22,8 +22,6 @@
  *    Email: <[email protected]>
  */
 
-#define	_GNU_SOURCE
-#define _FILE_OFFSET_BITS 64
 #include	<unistd.h>
 #if !defined(__dietlibc__) && !defined(__KLIBC__)
 extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));

mdmon.c +0 -4

index 0ec4259..e378ffe 100644
@@ -39,10 +39,6 @@
  *
  */
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
 #include	<unistd.h>
 #include	<stdlib.h>
 #include	<sys/types.h>

msg.c +0 -4

index 8d52b94..7390fcb 100644
@@ -16,9 +16,6 @@
  * this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 
--

To unsubscribe from this list: send the line "unsubscribe linux-raid" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Artur Wojcik

author

2010-01-29 15:05 UTC #3 lore raw

Quoted 8 lines · Neil Brown

Quoted 2 lines · On Thu, 28 Jan 2010 16:47:45 +0100 Artur Wojcik <[email protected]> wrote:
This patch will move _GNU_SOURCE and _FILE_OFFSET_BITS=64 from various source files to Makefile.
Why?

The reason is to clean up the code. The new files will appear soon and I want this two definitions to be set globally instead of per source file.

There's the plan to use GNU autotools to simply the build process, too.

Thanks,
Artur

Neil Brown

2010-01-29 21:54 UTC #4 lore raw

Quoted 4 lines · On Fri, 29 Jan 2010 16:05:58 +0100 Artur Wojcik <[email protected]> wrote:

Quoted 3 lines · Neil Brown
On Thu, 28 Jan 2010 16:47:45 +0100
Artur Wojcik <[email protected]> wrote:

Quoted 8 lines

Quoted 5 lines
Quoted 2 lines
This patch will move _GNU_SOURCE and _FILE_OFFSET_BITS=64 from various source files to Makefile.
Why?
The reason is to clean up the code. The new files will appear soon and I want this two definitions to be set globally instead of per source file.

Personally, I prefer them to be set just where they are needed. You could possibly convince me to put them in mdadm.h, but not in Makefile.

Quoted 2 lines

There's the plan to use GNU autotools to simply the build process, too.

That plan should be dropped immediately. It won't happen.

NeilBrown