diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-12-31 14:40:44 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-12-31 14:40:44 (GMT) |
| commit | 75b6f523ab85b9b9b256927183b4267573bbcd2e (patch) | |
| tree | 4d1f76d072f8ce210ddbf85b32bb6783dc88844f /Utilities | |
| parent | d512118079a7cf2a21dac13a29aaaa0563ef9e0e (diff) | |
| download | CMake-75b6f523ab85b9b9b256927183b4267573bbcd2e.zip CMake-75b6f523ab85b9b9b256927183b4267573bbcd2e.tar.gz CMake-75b6f523ab85b9b9b256927183b4267573bbcd2e.tar.bz2 | |
COMP: Attempt to fix problems with major and minor
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmtar/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/cmtar/config.h.in | 6 | ||||
| -rw-r--r-- | 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 6b8f4b6..d79052b 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 05a7710..1b34680 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 60be2af..a382abd 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 |