diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2000-10-09 14:02:25 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2000-10-09 14:02:25 +0000 |
| commit | 21fdffa58a170667cf0c4fbd069698697eade422 (patch) | |
| tree | 3ced9304694af9343c5c1d577bb071a6cf7bfad7 | |
| parent | 42f1b6c5447bd04b2f6a2bdebf2d0481f61bcd3a (diff) | |
| download | cygnal-21fdffa58a170667cf0c4fbd069698697eade422.tar.gz cygnal-21fdffa58a170667cf0c4fbd069698697eade422.tar.bz2 cygnal-21fdffa58a170667cf0c4fbd069698697eade422.zip | |
* fhandler_mem.cc: Eliminate unused include statements.
(fhandler_dev_mem::fhandler_dev_mem): Check for 9X/ME.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_mem.cc | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 8872bc527..c4a904ea3 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 9 15:58:00 2000 Corinna Vinschen <corinna@vinschen.de> + + * fhandler_mem.cc: Eliminate unused include statements. + (fhandler_dev_mem::fhandler_dev_mem): Check for 9X/ME. + Mon Oct 9 15:11:00 2000 Corinna Vinschen <corinna@vinschen.de> * fhandler.h (fhandler_dev_mem): Erase member `init_phase' and diff --git a/winsup/cygwin/fhandler_mem.cc b/winsup/cygwin/fhandler_mem.cc index 61e1d1456..4385cbe07 100644 --- a/winsup/cygwin/fhandler_mem.cc +++ b/winsup/cygwin/fhandler_mem.cc @@ -9,7 +9,6 @@ details. */ #include "winsup.h" -#include <sys/termios.h> #include <fcntl.h> #include <errno.h> #include <unistd.h> @@ -17,10 +16,8 @@ #include <ntdef.h> #include "autoload.h" -#include "cygheap.h" #include "cygerrno.h" #include "fhandler.h" -#include "path.h" /* * The following both data structures aren't defined anywhere in the Microsoft @@ -65,6 +62,13 @@ fhandler_dev_mem::fhandler_dev_mem (const char *name, int nunit) : fhandler_base (FH_MEM, name), unit (nunit) { + /* Reading physical memory only supported on NT/W2K. */ + if (os_being_run != winNT) + { + mem_size = 0; + return; + } + if (unit == 1) /* /dev/mem */ { NTSTATUS ret; |