summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-12-17 19:45:02 +0000
committerKarl Berry <karl@freefriends.org>2009-12-17 19:45:02 +0000
commit3918f15bc2bf0c9dff8aa7b58117d2883fdc9504 (patch)
treeeaf932fdcb6d1117e0fd45012fbe1675a80140e4
parent9335bf0e753cae1eefb3391478a92058af8eda34 (diff)
merge c-proto.h from w32tex
git-svn-id: svn://tug.org/texlive/trunk@16435 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/c-proto.h6
2 files changed, 9 insertions, 1 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 5f909eee39f..c78d74c5b60 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-17 Karl Berry <karl@tug.org>
+
+ * c-proto.h (KPSE_DLL) [WIN32]: #define in this case, per Akira.
+
2009-12-15 Karl Berry <karl@tug.org>
* kpsewhich.c (-safe-in-name, -safe-out-name): new options.
diff --git a/Build/source/texk/kpathsea/c-proto.h b/Build/source/texk/kpathsea/c-proto.h
index 6482ca502f6..53aac655398 100644
--- a/Build/source/texk/kpathsea/c-proto.h
+++ b/Build/source/texk/kpathsea/c-proto.h
@@ -1,6 +1,6 @@
/* c-proto.h: macros to include or discard prototypes.
- Copyright 1992, 1993, 1995, 1996, 2008 Karl Berry.
+ Copyright 1992, 1993, 1995, 1996, 2008, 2009 Karl Berry.
Copyright 1999, 2000, 2001, 2003, 2004, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -19,6 +19,10 @@
#ifndef KPATHSEA_C_PROTO_H
#define KPATHSEA_C_PROTO_H
+#if defined (WIN32)
+#define KPSE_DLL 1
+#endif /* WIN32 */
+
#if defined (KPSE_DLL) && (defined (WIN32) || defined (__CYGWIN__))
#ifdef MAKE_KPSE_DLL
#define KPSEDLL __declspec(dllexport)