From d472d8ddc0e2f7c663b622eb483664cd7b017acd Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Sun, 21 Feb 2010 18:38:17 +0000 Subject: [PATCH] Win95 is not supported by a long time now. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33527 a592a061-630c-0410-9148-cb99ea01b6c8 --- configure.ac | 6 +----- development/cmake/configCompiler.h.cmake | 4 ---- development/cmake/configCompiler.h.msvc | 4 ---- development/scons/SConstruct | 5 ----- src/support/os_win32.cpp | 19 ------------------- 5 files changed, 1 insertion(+), 37 deletions(-) diff --git a/configure.ac b/configure.ac index 7cfe26ea31..4869fe2706 100644 --- a/configure.ac +++ b/configure.ac @@ -169,7 +169,7 @@ AC_LANG_POP(C) # some standard header files AC_HEADER_MAJOR -AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h NewAPIs.h utime.h sys/utime.h) +AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h locale.h utime.h sys/utime.h) # some standard structures AC_HEADER_STAT @@ -296,10 +296,6 @@ char * strerror(int n); # define BOOST_POSIX_PATH 1 #endif -#if defined(HAVE_NEWAPIS_H) -# define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 -#endif - /* * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t * support compiled in: diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake index ce2b34ee8e..487eef9729 100644 --- a/development/cmake/configCompiler.h.cmake +++ b/development/cmake/configCompiler.h.cmake @@ -143,10 +143,6 @@ # define BOOST_POSIX_PATH 1 #endif -#ifndef HAVE_NEWAPIS_H -# define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 -#endif - /* * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t * support compiled in: diff --git a/development/cmake/configCompiler.h.msvc b/development/cmake/configCompiler.h.msvc index 37ab612e1c..fe08ab939c 100644 --- a/development/cmake/configCompiler.h.msvc +++ b/development/cmake/configCompiler.h.msvc @@ -146,10 +146,6 @@ # define BOOST_POSIX_PATH 1 #endif -#ifndef HAVE_NEWAPIS_H -# define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 -#endif - /* * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t * support compiled in: diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 634ed18102..f44eb7ff73 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -740,7 +740,6 @@ utils.createConfigFile(conf, ('ostream', 'HAVE_OSTREAM', 'cxx'), ('locale', 'HAVE_LOCALE', 'cxx'), ('sstream', 'HAVE_SSTREAM', 'cxx'), - #('newapis.h', 'HAVE_NEWAPIS_H', 'c'), ], custom_tests = [ (env.has_key('assertions') and env['assertions'] and mode == 'debug', @@ -775,10 +774,6 @@ utils.createConfigFile(conf, #define BOOST_ALL_NO_LIB 1 -#if defined(HAVE_NEWAPIS_H) -# define WANT_GETFILEATTRIBUTESEX_WRAPPER 1 -#endif - /* * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t * support compiled in: diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp index 72612e2b6e..072920442b 100644 --- a/src/support/os_win32.cpp +++ b/src/support/os_win32.cpp @@ -32,25 +32,6 @@ #include -/* The GetLongPathName macro may be defined on the compiling machine, - * but we must use a bit of trickery if the resulting executable is - * to run on a Win95 machine. - * Fortunately, Microsoft provide the trickery. All we need is the - * NewAPIs.h header file, available for download from Microsoft as - * part of the Platform SDK. - */ -#if defined (HAVE_NEWAPIS_H) -// This should be defined already to keep Boost.Filesystem happy. -# if !defined (WANT_GETFILEATTRIBUTESEX_WRAPPER) -# error Expected WANT_GETFILEATTRIBUTESEX_WRAPPER to be defined! -# endif -# define WANT_GETLONGPATHNAME_WRAPPER 1 -# define COMPILE_NEWAPIS_STUBS -# include -# undef COMPILE_NEWAPIS_STUBS -# undef WANT_GETLONGPATHNAME_WRAPPER -#endif - #include #include // _getdrive #include // SHGetFolderPath