summaryrefslogtreecommitdiff
path: root/srfi
diff options
context:
space:
mode:
Diffstat (limited to 'srfi')
-rw-r--r--srfi/ChangeLog5
-rw-r--r--srfi/srfi-13.h8
-rw-r--r--srfi/srfi-14.h4
-rw-r--r--srfi/srfi-4.h4
4 files changed, 11 insertions, 10 deletions
diff --git a/srfi/ChangeLog b/srfi/ChangeLog
index 3504a15b0..34bd08a47 100644
--- a/srfi/ChangeLog
+++ b/srfi/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-04 Stefan Jahn <stefan@lkcc.org>
+
+ * srfi-13.h, srfi-14.h, srfi-4.h: Follow-up patch. Renamed
+ __FOO__ macros into FOO.
+
2001-11-03 Marius Vollmer <mvo@zagadka.ping.de>
* Makefile.am (libguile_srfi_srfi_4_la_LIBADD,
diff --git a/srfi/srfi-13.h b/srfi/srfi-13.h
index 0c81a43a5..1127cde26 100644
--- a/srfi/srfi-13.h
+++ b/srfi/srfi-13.h
@@ -50,9 +50,9 @@
which should be exported or imported in the resulting dynamic link
library in the Win32 port. */
-#if defined (__SCM_SRFI1314_IMPORT__)
+#if defined (SCM_SRFI1314_IMPORT)
# define SCM_SRFI1314_API __declspec (dllimport) extern
-#elif defined (__SCM_SRFI1314_EXPORT__) || defined (DLL_EXPORT)
+#elif defined (SCM_SRFI1314_EXPORT) || defined (DLL_EXPORT)
# define SCM_SRFI1314_API __declspec (dllexport) extern
#else
# define SCM_SRFI1314_API extern
@@ -137,8 +137,4 @@ SCM_SRFI1314_API SCM scm_string_tokenize (SCM s, SCM token_char, SCM start, SCM
SCM_SRFI1314_API SCM scm_string_filter (SCM s, SCM char_pred, SCM start, SCM end);
SCM_SRFI1314_API SCM scm_string_delete (SCM s, SCM char_pred, SCM start, SCM end);
-
-
-
-
#endif /* SCM_SRFI_13_H */
diff --git a/srfi/srfi-14.h b/srfi/srfi-14.h
index fbf935e30..816ef0aa3 100644
--- a/srfi/srfi-14.h
+++ b/srfi/srfi-14.h
@@ -50,9 +50,9 @@
which should be exported or imported in the resulting dynamic link
library in the Win32 port. */
-#if defined (__SCM_SRFI1314_IMPORT__)
+#if defined (SCM_SRFI1314_IMPORT)
# define SCM_SRFI1314_API __declspec (dllimport) extern
-#elif defined (__SCM_SRFI1314_EXPORT__) || defined (DLL_EXPORT)
+#elif defined (SCM_SRFI1314_EXPORT) || defined (DLL_EXPORT)
# define SCM_SRFI1314_API __declspec (dllexport) extern
#else
# define SCM_SRFI1314_API extern
diff --git a/srfi/srfi-4.h b/srfi/srfi-4.h
index f53784d60..0a522991e 100644
--- a/srfi/srfi-4.h
+++ b/srfi/srfi-4.h
@@ -50,9 +50,9 @@
which should be exported or imported in the resulting dynamic link
library in the Win32 port. */
-#if defined (__SCM_SRFI4_IMPORT__)
+#if defined (SCM_SRFI4_IMPORT)
# define SCM_SRFI4_API __declspec (dllimport) extern
-#elif defined (__SCM_SRFI4_EXPORT__) || defined (DLL_EXPORT)
+#elif defined (SCM_SRFI4_EXPORT) || defined (DLL_EXPORT)
# define SCM_SRFI4_API __declspec (dllexport) extern
#else
# define SCM_SRFI4_API extern