[MLton-commit] r4624

Matthew Fluet MLton@mlton.org
Mon, 29 May 2006 20:41:48 -0700


OpenBSD 3.9 adds C99 stdint.h and inttypes.h and changes the signedness of clock_t; these are changes from OpenBSD 3.8
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/basis-library/config/c/x86-openbsd/c-types.sml
U   mlton/branches/on-20050822-x86_64-branch/runtime/platform/openbsd.h

----------------------------------------------------------------------

Modified: mlton/branches/on-20050822-x86_64-branch/basis-library/config/c/x86-openbsd/c-types.sml
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/basis-library/config/c/x86-openbsd/c-types.sml	2006-05-30 03:21:33 UTC (rev 4623)
+++ mlton/branches/on-20050822-x86_64-branch/basis-library/config/c/x86-openbsd/c-types.sml	2006-05-30 03:41:47 UTC (rev 4624)
@@ -86,8 +86,8 @@
 functor C_RLim_ChooseWordN (A: CHOOSE_WORDN_ARG) = ChooseWordN_Word64 (A)
 
 (* from <sys/types.h> *)
-structure C_Clock = struct open Word32 type t = word end
-functor C_Clock_ChooseWordN (A: CHOOSE_WORDN_ARG) = ChooseWordN_Word32 (A)
+structure C_Clock = struct open Int32 type t = int end
+functor C_Clock_ChooseIntN (A: CHOOSE_INTN_ARG) = ChooseIntN_Int32 (A)
 structure C_Dev = struct open Int32 type t = int end
 functor C_Dev_ChooseIntN (A: CHOOSE_INTN_ARG) = ChooseIntN_Int32 (A)
 structure C_GId = struct open Word32 type t = word end

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/platform/openbsd.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/platform/openbsd.h	2006-05-30 03:21:33 UTC (rev 4623)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/platform/openbsd.h	2006-05-30 03:41:47 UTC (rev 4624)
@@ -38,38 +38,38 @@
 int fpclassify32 (float f);
 int fpclassify64 (double d);
 
-#ifndef PRIu8
-#define PRIu8 "hhu"
-#endif
-#ifndef PRIu16
-#define PRIu16 "hu"
-#endif
-#ifndef PRIx16
-#define PRIx16 "hx"
-#endif
-#ifndef PRId32
-#define PRId32 "d"
-#endif
-#ifndef PRIu32
-#define PRIu32 "u"
-#endif
-#ifndef PRIx32
-#define PRIx32 "x"
-#endif
-typedef long long int intmax_t;
-#ifndef INTMAX_MIN
-#define INTMAX_MIN LLONG_MIN
-#endif
-typedef unsigned long long int uintmax_t;
-#ifndef PRIuMAX
-#define PRIuMAX "llu"
-#endif
-#ifndef PRIxMAX
-#define PRIxMAX "llx"
-#endif
+/* #ifndef PRIu8 */
+/* #define PRIu8 "hhu" */
+/* #endif */
+/* #ifndef PRIu16 */
+/* #define PRIu16 "hu" */
+/* #endif */
+/* #ifndef PRIx16 */
+/* #define PRIx16 "hx" */
+/* #endif */
+/* #ifndef PRId32 */
+/* #define PRId32 "d" */
+/* #endif */
+/* #ifndef PRIu32 */
+/* #define PRIu32 "u" */
+/* #endif */
+/* #ifndef PRIx32 */
+/* #define PRIx32 "x" */
+/* #endif */
+/* typedef long long int intmax_t; */
+/* #ifndef INTMAX_MIN */
+/* #define INTMAX_MIN LLONG_MIN */
+/* #endif */
+/* typedef unsigned long long int uintmax_t; */
+/* #ifndef PRIuMAX */
+/* #define PRIuMAX "llu" */
+/* #endif */
+/* #ifndef PRIxMAX */
+/* #define PRIxMAX "llx" */
+/* #endif */
 
-#ifndef PRIxPTR
-#define PRIxPTR "lx"
-#endif
+/* #ifndef PRIxPTR */
+/* #define PRIxPTR "lx" */
+/* #endif */
 
 extern char **environ; /* for Posix_ProcEnv_environ */