Merge profiler branch

[gnu-emacs] / src / dosfns.h

diff --git a/src/dosfns.h b/src/dosfns.h
index f27b344bb5c0efba20e73f87e8ad375fd4ca127e..9747c364d714adb24d5a2c278287b93b60b7a0bf 100644 (file)
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -1,13 +1,16 @@
 /* MS-DOS specific Lisp utilities interface.
    Coded by Manabu Higashida, 1991.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Modified by Morten Welinder, 1993-1994.
+
+Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2012
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +18,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#define DOS_COUNTRY_INFO 34    /* no of bytes returned by dos int 38h */
+extern unsigned char dos_country_info[DOS_COUNTRY_INFO];
+
+#ifndef HAVE_X_WINDOWS
+extern int         msdos_stdcolor_idx  (const char *);
+extern Lisp_Object msdos_stdcolor_name (int);
+extern void        x_set_title (struct frame *, Lisp_Object);
+#endif
 
-extern int dos_country_code;
-extern int dos_codepage;
-extern Lisp_Object Vdos_version;