(FONT_AVG_WIDTH): Remove obsolete macro.

(CP_8BIT, CP_UNICODE, CP_UNKNOWN): Remove obsolete constants.

diff --git a/src/ChangeLog b/src/ChangeLog
index 05873b192cfe7c4b1b0a783dd6cdd2b4ae4e3567..f0095e61bb825e751c32de0b8577501e00b8fe06 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-26  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.h (FONT_AVG_WIDTH): Remove obsolete macro.
+        (CP_8BIT, CP_UNICODE, CP_UNKNOWN): Remove obsolete constants.
+
 2008-06-26  Juanma Barranquero  <lekktu@gmail.com>
 
        * Makefile.in (SOME_MACHINE_OBJECTS): Remove w32bdf.o.

diff --git a/src/w32term.h b/src/w32term.h
index defb3231d5f6e01cd5e82f6309901e3297d5e4a1..f796e597bef4b1ca5a417924ea4a4f7ebff4f6ac 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -29,13 +29,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define FONT_HEIGHT(f)    ((f)->height)
 #define FONT_BASE(f)      ((f)->ascent)
 #define FONT_DESCENT(f)   ((f)->descent)
-#define FONT_AVG_WIDTH(f) ((f)->average_width)
 
 #define CP_DEFAULT 1004
-/* Special pseudo-codepages. */
-#define CP_8BIT      -1
-#define CP_UNICODE   -2
-#define CP_UNKNOWN   -3
 
 #define CHECK_W32_FRAME(f, frame)              \
   if (NILP (frame))                            \