Skip to content
Snippets Groups Projects
Commit 9dde8d1d authored by ballen4705's avatar ballen4705
Browse files

If linux/hdreg.h exists, then we use the three #define's from there. Else we

do it ourselves.


git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1352 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent b7c4f434
No related branches found
No related tags found
No related merge requests found
CHANGELOG for smartmontools CHANGELOG for smartmontools
$Id: CHANGELOG,v 1.285 2003/12/08 20:26:19 pjwilliams Exp $ $Id: CHANGELOG,v 1.286 2003/12/09 19:57:55 ballen4705 Exp $
The most recent version of this file is: The most recent version of this file is:
http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
...@@ -24,6 +24,9 @@ NOTES FOR FUTURE RELEASES: see TODO file. ...@@ -24,6 +24,9 @@ NOTES FOR FUTURE RELEASES: see TODO file.
<ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE> <ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE>
[BA] linux: check for linux/hdreg.h. If it's there, use it. If
not, provide the necessary definitions ourselves.
[PW] Removed warning for IBM Deskstar 40GV & 75GXP series drives [PW] Removed warning for IBM Deskstar 40GV & 75GXP series drives
with TXAOA5AA firmware with TXAOA5AA firmware
......
# #
# $Id: configure.in,v 1.40 2003/11/30 13:53:14 ballen4705 Exp $ # $Id: configure.in,v 1.41 2003/12/09 19:57:55 ballen4705 Exp $
# #
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50) AC_PREREQ(2.50)
...@@ -7,7 +7,7 @@ AC_INIT(smartmontools, 5.27, smartmontools-support@lists.sourceforge.net) ...@@ -7,7 +7,7 @@ AC_INIT(smartmontools, 5.27, smartmontools-support@lists.sourceforge.net)
AC_CONFIG_SRCDIR(smartctl.c) AC_CONFIG_SRCDIR(smartctl.c)
smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"` smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"`
smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.40 2003/11/30 13:53:14 ballen4705 Exp $'` smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.41 2003/12/09 19:57:55 ballen4705 Exp $'`
smartmontools_release_date=2003/11/30 smartmontools_release_date=2003/11/30
smartmontools_release_time="13:36:20 UTC" smartmontools_release_time="13:36:20 UTC"
...@@ -32,7 +32,7 @@ dnl Checks for libraries. ...@@ -32,7 +32,7 @@ dnl Checks for libraries.
dnl Checks for header files. dnl Checks for header files.
AC_CHECK_HEADER([getopt.h]) AC_CHECK_HEADER([getopt.h])
dnl AC_CHECK_HEADER([linux/hdreg.h],, [AC_MSG_ERROR([Need linux/hdreg.h])]) AC_CHECK_HEADERS([linux/hdreg.h])
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
......
...@@ -52,7 +52,14 @@ ...@@ -52,7 +52,14 @@
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <glob.h> #include <glob.h>
#ifdef HAVE_LINUX_HDREG_H
#include <linux/hdreg.h> #include <linux/hdreg.h>
#else
#define HDIO_DRIVE_TASK 0x031e
#define HDIO_DRIVE_CMD 0x031f
#define HDIO_GET_IDENTITY 0x030d
#endif
#include "atacmds.h" #include "atacmds.h"
#include "config.h" #include "config.h"
...@@ -61,7 +68,7 @@ ...@@ -61,7 +68,7 @@
#include "smartd.h" #include "smartd.h"
#include "utility.h" #include "utility.h"
const char *os_XXXX_c_cvsid="$Id: os_linux.c,v 1.34 2003/12/08 20:36:03 ballen4705 Exp $" \ const char *os_XXXX_c_cvsid="$Id: os_linux.c,v 1.35 2003/12/09 19:57:55 ballen4705 Exp $" \
ATACMDS_H_CVSID CONFIG_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID; ATACMDS_H_CVSID CONFIG_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
// to hold onto exit code for atexit routine // to hold onto exit code for atexit routine
......
...@@ -52,7 +52,14 @@ ...@@ -52,7 +52,14 @@
#include <dirent.h> #include <dirent.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <glob.h> #include <glob.h>
#ifdef HAVE_LINUX_HDREG_H
#include <linux/hdreg.h> #include <linux/hdreg.h>
#else
#define HDIO_DRIVE_TASK 0x031e
#define HDIO_DRIVE_CMD 0x031f
#define HDIO_GET_IDENTITY 0x030d
#endif
#include "atacmds.h" #include "atacmds.h"
#include "config.h" #include "config.h"
...@@ -61,7 +68,7 @@ ...@@ -61,7 +68,7 @@
#include "smartd.h" #include "smartd.h"
#include "utility.h" #include "utility.h"
const char *os_XXXX_c_cvsid="$Id: os_linux.cpp,v 1.34 2003/12/08 20:36:03 ballen4705 Exp $" \ const char *os_XXXX_c_cvsid="$Id: os_linux.cpp,v 1.35 2003/12/09 19:57:55 ballen4705 Exp $" \
ATACMDS_H_CVSID CONFIG_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID; ATACMDS_H_CVSID CONFIG_H_CVSID OS_XXXX_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
// to hold onto exit code for atexit routine // to hold onto exit code for atexit routine
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment