summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2011-08-02 13:05:11 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2011-08-02 13:05:11 +0000
commit8d812296011b75f9bd787ff9ebe574a4265a11c9 (patch)
treefc93270e32c02813c3eb677abb486e31d9d2e50a
parent9a634e078306d7a674684828beaabdc6f14c37cc (diff)
update win32lib.[ch]
git-svn-id: svn://tug.org/texlive/trunk@23315 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/ChangeLog7
-rw-r--r--Build/source/texk/kpathsea/win32lib.c4
-rw-r--r--Build/source/texk/kpathsea/win32lib.h17
3 files changed, 21 insertions, 7 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 33023544ee9..fdd2a27d5b8 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-02 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * win32lib.h: follow mingw32.h for boolean and move definitions
+ for win32 functions from lib.h.
+ * win32lib.c: change definitions of xfseek64 and xftell64 to match
+ with xfseeko and xftello.
+
2011-08-02 Peter Breitenlohner <peb@mppmu.mpg.de>
More diffs between TeX Live and W32TeX.
diff --git a/Build/source/texk/kpathsea/win32lib.c b/Build/source/texk/kpathsea/win32lib.c
index a7321e3b7ab..0ca0367d466 100644
--- a/Build/source/texk/kpathsea/win32lib.c
+++ b/Build/source/texk/kpathsea/win32lib.c
@@ -282,7 +282,7 @@ int __cdecl kpathsea_win32_pclose (kpathsea kpse, FILE *f)
/* large file support */
void
-xfseek64 (FILE *f, __int64 offset, int wherefrom, char *filename)
+xfseek64 (FILE *f, __int64 offset, int wherefrom, const char *filename)
{
fflush(f);
if (_lseeki64(fileno(f), offset, wherefrom) < (__int64)0)
@@ -290,7 +290,7 @@ xfseek64 (FILE *f, __int64 offset, int wherefrom, char *filename)
}
__int64
-xftell64 (FILE *f, char *filename)
+xftell64 (FILE *f, const char *filename)
{
__int64 where;
fflush(f);
diff --git a/Build/source/texk/kpathsea/win32lib.h b/Build/source/texk/kpathsea/win32lib.h
index 89d35166a4b..bb1edad7d15 100644
--- a/Build/source/texk/kpathsea/win32lib.h
+++ b/Build/source/texk/kpathsea/win32lib.h
@@ -222,7 +222,11 @@
#define _WINSOCKAPI_ 1
#endif
+#define boolean saved_boolean
#include <windows.h>
+#undef boolean
+
+#include <kpathsea/types.h>
/* Defines size_t and alloca (). */
#include <malloc.h>
@@ -240,6 +244,11 @@
#undef min
#endif
+extern KPSEDLL FILE *kpathsea_win32_popen (kpathsea kpse, char *cmd, char *mode);
+extern KPSEDLL int kpathsea_win32_pclose (kpathsea kpse, FILE *f);
+extern KPSEDLL struct passwd *kpathsea_getpwnam (kpathsea kpse, char *name);
+extern KPSEDLL int kpathsea_win32_system(kpathsea kpse, char *cmd);
+
#if defined (KPSE_COMPAT_API)
extern KPSEDLL struct passwd *getpwnam (char *name);
#define MAX_PIPES 128
@@ -252,16 +261,14 @@ extern KPSEDLL int pclose(FILE * f);
extern KPSEDLL int system(char * cmd);
#endif /* KPSE_COMPAT_API */
-extern KPSEDLL void xfseek64 (FILE *f, __int64 offset, int wherefrom, char *fname);
-extern KPSEDLL __int64 xftell64 (FILE *f, char *fname);
+extern KPSEDLL void xfseek64 (FILE *f, __int64 offset, int wherefrom, const char *fname);
+extern KPSEDLL __int64 xftell64 (FILE *f, const char *fname);
extern KPSEDLL void texlive_gs_init(void);
extern KPSEDLL int getlongpath (char *output, char *input, int len);
extern KPSEDLL char *get_home_directory (void);
-/* I don't define xfseeko and xftello in order to find where they are
- used and to rewrite them by hand using xfseek64 and xftell64.
+#define off_t __int64
#define xfseeko xfseek64
#define xftello xftell64
-*/
#endif /* not KPATHSEA_WIN32LIB_H */