char * -> const char *.

[putex/putex.git] / src / texsourc / yandytex.h

diff --git a/src/texsourc/yandytex.h b/src/texsourc/yandytex.h
index 4b41e6a..596fdb5 100644 (file)
--- a/src/texsourc/yandytex.h
+++ b/src/texsourc/yandytex.h
@@ -20,17 +20,19 @@
 
 #define WORDS_BIGENDIAN 0
 
-//#pragma warning(disable:4032)
-#pragma warning(disable:4201)
-#pragma warning(disable:4996)
-#pragma warning(disable:4701)
-//#pragma warning(disable:4100)
-//#pragma warning(disable:4244)
-#pragma warning(disable:4131) // old style declarator
-#pragma warning(disable:4135) // conversion between different integral types
-#pragma warning(disable:4127) // conditional expression is constant
-
-/* ``Standard'' headers.  */
+#ifdef _WIN32
+  #pragma warning(disable:4201) // nameless struct/union
+  #pragma warning(disable:4996) // a function that was marked with deprecated
+  #pragma warning(disable:4701) // potentially uninitialized local variable 'name' used
+  #pragma warning(disable:4135) // conversion between different integral types
+  #pragma warning(disable:4127) // conditional expression is constant
+#endif
+
+#include <stdarg.h>
+#include <setjmp.h>
+#include <time.h>
+#include <signal.h>
+
 #include <kpathsea/c-auto.h>
 #include <kpathsea/c-std.h>
 #include <kpathsea/c-pathmx.h>
@@ -46,10 +48,6 @@
 #include <kpathsea/tex-file.h>
 #include <kpathsea/variable.h>
 #include <kpathsea/absolute.h>
-#include <stdarg.h>
-#include <setjmp.h>
-#include <time.h>
-#include <signal.h>
 #ifdef _WIN32
   #include <kpathsea/win32lib.h>
 #else
@@ -57,13 +55,13 @@
 #endif
 #include "zlib.h"
 #include "md5.h"
-#include "hpdf.h"
-#include "hpdf_utils.h"
 
-typedef long long   integer;
-typedef double      glue_ratio;
-typedef double      real;
-typedef FILE *      alpha_file;
+typedef long long integer;
+typedef double    glue_ratio;
+typedef double    real;
+typedef FILE * alpha_file;
+typedef FILE * byte_file;
+typedef FILE * word_file;
 typedef unsigned char  ASCII_code;
 typedef unsigned short KANJI_code;
 typedef unsigned char  eight_bits;
@@ -73,11 +71,10 @@ typedef integer str_number;
 typedef unsigned char packed_ASCII_code;
 typedef integer scaled;
 typedef integer nonnegative_integer;
-typedef char small_number;
+typedef unsigned char small_number;
 
 typedef enum
 {
-  NO_FILE_PATH = -1,
   TEXFORMATPATH,
   TEXINPUTPATH,
   TFMFILEPATH,
@@ -91,26 +88,21 @@ typedef enum
 #define chr(x)   (x)
 #define ord(x)   (x)
 #define odd(x)   ((x) % 2)
-#define round(x) zround((double) (x))
+#define round(x) web2c_round((double) (x))
 #define decr(x)  --(x)
 #define incr(x)  ++(x)
 #define fabs(x)  ((x) >= 0.0 ? (x) : -(x))
-#define PATHMAX  PATH_MAX
 #define toint(x) ((integer) (x))
-#define a_open_in(f, p) open_input (&(f), p, FOPEN_R_MODE)
-#define a_open_out(f)   open_output (&(f), FOPEN_W_MODE)
-#define a_close(f)         check_fclose (f)
 
 #define MAXLINE 256
 
-extern integer zround (double);
-extern boolean eoln (FILE * file);
-extern boolean open_input (FILE **f, path_constant_type path_index, char *fopen_mode);
-extern boolean open_output (FILE **f, char *fopen_mode);
-extern int check_fclose (FILE * f);
+extern integer web2c_round (double r);
+extern boolean open_input  (FILE ** f, path_constant_type path_index, char * fopen_mode);
+extern boolean open_output (FILE ** f, char * fopen_mode);
+extern int check_fclose    (FILE * f);
 
-#define show_line(str,flag) fputs(str,stdout)
-#define show_char(chr) putc(chr, stdout)
+#define show_line(str, flag) fputs(str, stdout)
+#define show_char(chr)       putc(chr, stdout)
 extern char log_line[];
 
-#endif
\ No newline at end of file
+#endif