get rid of nt_defines.h

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8785 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 6c41ea2bf39cfac38daa5b09c69a0e180205c1db..b6bea13b374e766d07845a418641b4fefb6488f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-27  Kayvan Sylvan <kayvan@sylvan.com>
+
+       * configure.ac (AH_BOTTOM): Remove reference to support/nt_defines.h
+
 2004-05-26  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * autogen.sh (ACLOCAL): make all aclocal find m4

diff --git a/config/ChangeLog b/config/ChangeLog
index cc51832021eeacbf7a4f987068f6031d36611803..7c5b5e456239589afbb37e6808dc05119ccf8812 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-27  Lars Gullik Bjonnes  <larsbj@gullik.net>
+
+       * acconfig.h: remove file
+
 2004-05-26  Lars Gullik Bjonnes  <larsbj@lyx.org>
 
        * nls.m4: new file

diff --git a/config/acconfig.h b/config/acconfig.h
deleted file mode 100644 (file)
index 525c081..0000000
--- a/config/acconfig.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- C++ -*- */
-/* This is the compilation configuration file for LyX. It was generated by
-   autoconf's configure. You might want to change some of the defaults if
-   something goes wrong during the compilation
-
-   * This file is part of
-   * ======================================================
-   *
-   *           LyX, the High Level Word Processor
-   *
-   *           Copyright 1995 Matthias Ettrich
-   *           Copyright 1995-2001 The LyX Team.
-   *
-   *======================================================*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-
-@TOP@
-
-/* Define as 1 if the MKSTEMP function is declared */
-#undef HAVE_DECL_MKSTEMP
-
-/* Define if you have the function prototype for snprintf().  */
-#undef HAVE_DECL_SNPRINTF
-
-/* Define if you have the function prototype for vsnprintf().  */
-#undef HAVE_DECL_VSNPRINTF
-
-/* Define if you have the function prototype istreambuf_iterator in
-   <iterator> */
-#undef HAVE_DECL_ISTREAMBUF_ITERATOR
-
-@BOTTOM@
-
-/************************************************************
- ** You should not need to change anything beyond this point */
-
-#ifndef HAVE_STRCHR
-#define strchr(a,b)     index(a,b)
-#endif
-
-#ifndef HAVE_MEMMOVE
-#define memmove(a, b, c)  bcopy(b, a, c)
-#endif
-
-#ifdef HAVE_MKSTEMP
-#ifndef HAVE_DECL_MKSTEMP
-#if defined (__cplusplus)
-extern "C"
-#endif
-int mkstemp(char*);
-#endif
-#endif
-
-/* C++ always support the keyword `inline' */
-#if defined inline && defined __cplusplus
-/**/#undef inline
-#endif
-
-/* C++ always has a good enough `const' */
-#if defined const && defined __cplusplus
-/**/#undef const
-#endif
-
-/* Check on the run if we are using exceptions during this compilation.*/
-#if defined(__sgi) || defined(__GNUC__)
-#  ifdef __EXCEPTIONS
-#    define USING_EXCEPTIONS
-#  endif
-#endif
-
-#if defined(__USLC__) || defined(__SUNPRO_CC) || defined(__COMO__) || defined(__ICL)
-#  define USING_EXCEPTIONS
-#endif
-
-#ifdef __EMX__
-#include "support/os2_defines.h"
-#endif
-
-#if defined(__CYGWIN__) || defined( __CYGWIN32__)
-#include "support/nt_defines.h"
-#endif
-
-/* Some support for the boost library. */
-/*
- * #ifndef HAVE_LIMITS
- * #define BOOST_NO_LIMITS
- * #endif
- *
- * #ifndef HAVE_SSTREAM
- * #define BOOST_NO_STRINGSTREAM
- * #endif
- */
-
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#define USE_BOOST_FORMAT 1
-#else
-#define USE_BOOST_FORMAT 0
-#endif
-
-#endif /* _CONFIG_H */

diff --git a/configure.ac b/configure.ac
index 39343ca812ec2daca6d15e90178cb58e52a4fc3c..5728ba83f88b2dcc131a7a680b838f719bc47c9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -361,10 +361,6 @@ int mkstemp(char*);
 #include "support/os2_defines.h"
 #endif
 
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-#include "support/nt_defines.h"
-#endif
-
 #if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
 #define USE_BOOST_FORMAT 1
 #else

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index de661d00f21eaf44033549388262de219f996836..77a561e4463e3c73c7798d4c82e76b8abf268c7f 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-27  Kayvan Sylvan <kayvan@sylvan.com>
+       
+       * Makefile.am (libsupport_la_SOURCES): remove reference to
+       nt_defines.h
+
 2004-05-20  Angus Leeming  <leeming@lyx.org>
 
        * debugstream.h: wrap the definition of debug_trait::DEBUG with

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 721e7b80b36c3d8a20ceeb35666bd920d60510ad..85b6e14916b78bd2b783a3f68121e7826b628ac2 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -51,7 +51,6 @@ libsupport_la_SOURCES = \
        lyxtime.h \
        lyxsum.C \
        mkdir.C \
-       nt_defines.h \
        os.C \
        os.h \
        os2_defines.h \

diff --git a/src/support/nt_defines.h b/src/support/nt_defines.h
deleted file mode 100644 (file)
index fe9d26f..0000000
--- a/src/support/nt_defines.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- C++ -*-
-/**
- * \file nt_defines.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * Prototypes and definitions needed for Windows NT.
- */
-
-#ifndef NT_DEFINES_H
-#define NT_DEFINES_H
-
-#endif // NT_DEFINES_H