Updating the ChangeLog file

[enscript.git] / src / gsint.h

diff --git a/src/gsint.h b/src/gsint.h
index b89d3b7..dde63aa 100644 (file)
--- a/src/gsint.h
+++ b/src/gsint.h
@@ -103,12 +103,8 @@ extern double atan2 ___P ((double, double));
 #include "dummypwd.h"
 #endif
 
-#if ENABLE_NLS
-#include <libintl.h>
+#include "gettext.h"
 #define _(String) gettext (String)
-#else
-#define _(String) String
-#endif
 
 #if HAVE_LC_MESSAGES
 #include <locale.h>
@@ -134,7 +130,7 @@ extern double atan2 ___P ((double, double));
   (('0' <= (ch) && (ch) <= '9') || (ch) == '.' || (ch) == '-' || (ch) == '+')
 
 /* Return the width of the character <ch> */
-#define CHAR_WIDTH(ch) (font_widths[(unsigned char) (ch)])
+#define FNT_CHAR_WIDTH(ch) (font_widths[(unsigned char) (ch)])
 
 /* Current point y movement from line to line. */
 #define LINESKIP (Fpt.h + baselineskip)
@@ -180,6 +176,7 @@ typedef enum
   ENC_ISO_8859_7,
   ENC_ISO_8859_9,
   ENC_ISO_8859_10,
+  ENC_ISO_8859_15,
   ENC_ASCII,
   ENC_ASCII_FISE,
   ENC_ASCII_DKNO,
@@ -326,8 +323,6 @@ typedef struct cached_font_info_st CachedFontInfo;
 
 extern char *program;
 extern FILE *ofp;
-extern char *version_string;
-extern char *ps_version_string;
 extern char *date_string;
 extern struct tm run_tm;
 extern struct tm mod_tm;