Changeset: f34f730efe97 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f34f730efe97
Modified Files:
common/utils/mutils.c
common/utils/mutils.h
Branch: Mar2025
Log Message:
Make funtions utf8towchar and wchartoutf8 available on all platforms.
diffs (51 lines):
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -43,7 +43,6 @@
#endif
#ifdef NATIVE_WIN32
-
#include <windows.h>
#include <wchar.h>
@@ -52,6 +51,7 @@
#define BIG_ENDIAN 4321
#define LITTLE_ENDIAN 1234
#define BYTE_ORDER LITTLE_ENDIAN
+#endif
wchar_t *
utf8towchar(const char *src)
@@ -185,6 +185,8 @@ wchartoutf8(const wchar_t *ws)
return (char *) us;
}
+#ifdef NATIVE_WIN32
+
/* translate Windows error code (GetLastError()) to Unix-style error */
int
winerror(int e)
diff --git a/common/utils/mutils.h b/common/utils/mutils.h
--- a/common/utils/mutils.h
+++ b/common/utils/mutils.h
@@ -48,9 +48,6 @@ mutils_export int closedir(DIR *dir);
mutils_export char *dirname(char *path);
-mutils_export wchar_t *utf8towchar(const char *src);
-mutils_export char *wchartoutf8(const wchar_t *src);
-
mutils_export FILE *MT_fopen(const char *filename, const char *mode);
mutils_export int MT_open(const char *filename, int flags);
mutils_export int MT_stat(const char *filename, struct stat *stb);
@@ -127,6 +124,9 @@ MT_access(const char *pathname, int mode
#endif
+mutils_export wchar_t *utf8towchar(const char *src);
+mutils_export char *wchartoutf8(const wchar_t *src);
+
mutils_export int MT_lockf(const char *filename, int mode);
mutils_export void print_trace(void);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
