From 75b6f523ab85b9b9b256927183b4267573bbcd2e Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Sat, 31 Dec 2005 09:40:44 -0500
Subject: [PATCH] COMP: Attempt to fix problems with major and minor

---
 Utilities/cmtar/CMakeLists.txt | 2 ++
 Utilities/cmtar/config.h.in    | 6 ++++++
 Utilities/cmtar/internal.h     | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Utilities/cmtar/CMakeLists.txt b/Utilities/cmtar/CMakeLists.txt
index 6b8f4b6a4..d79052be3 100644
--- a/Utilities/cmtar/CMakeLists.txt
+++ b/Utilities/cmtar/CMakeLists.txt
@@ -99,6 +99,8 @@ FOREACH(func
     strftime
     vsnprintf
     glob
+    major
+    minor
     )
   CHECK_SYMBOL_EXISTS_EX("${func}")
 ENDFOREACH(func)
diff --git a/Utilities/cmtar/config.h.in b/Utilities/cmtar/config.h.in
index 05a7710b0..1b34680ee 100644
--- a/Utilities/cmtar/config.h.in
+++ b/Utilities/cmtar/config.h.in
@@ -3,6 +3,12 @@
 /* Define if your system has a working basename */
 #cmakedefine HAVE_BASENAME @HAVE_BASENAME@
 
+/* Define if your system has a working major */
+#cmakedefine HAVE_MAJOR @HAVE_MAJOR@
+
+/* Define if your system has a working minor */
+#cmakedefine HAVE_MINOR @HAVE_MINOR@
+
 /* Define to 1 if you have the <ctype.h> header file. */
 #cmakedefine HAVE_CTYPE_H @HAVE_CTYPE_H@
 
diff --git a/Utilities/cmtar/internal.h b/Utilities/cmtar/internal.h
index 60be2af41..a382abd6d 100644
--- a/Utilities/cmtar/internal.h
+++ b/Utilities/cmtar/internal.h
@@ -15,9 +15,9 @@
 
 #include <libtar/libtar.h>
 
-#ifndef major
+#ifndef HAVE_MAJOR
 # define major(dev) ((int)(((dev) >> 8) & 0xff))
 #endif
-#ifndef minor
+#ifndef HAVE_MINOR
 # define minor(dev) ((int)((dev) & 0xff))
 #endif