* In principle, the only field that really should need to be
* 64 bits is the FileId_t
*/
-typedef uint32_t FileId_t;
+typedef uint64_t FileId_t;
typedef uint32_t DBId_t; /* general DB id type */
typedef uint32_t JobId_t;
# endif
#endif
+#ifndef HAVE_INTPTR_T
+#define HAVE_INTPTR_T 1
+# if (SIZEOF_INT_P == 4)
+typedef int32_t intptr_t;
+# else
+# if (SIZEOF_INT_P == 8)
+typedef int64_t intptr_t;
+# else
+# error "Can't find sizeof pointer. Required!"
+# endif
+# endif
+#endif
+
+#ifndef HAVE_UINTPTR_T
+#define HAVE_UINTPTR_T 1
+# if (SIZEOF_INT_P == 4)
+typedef uint32_t uintptr_t;
+# else
+# if (SIZEOF_INT_P == 8)
+typedef uint64_t uintptr_t;
+# else
+# error "Can't find sizeof pointer. Required!"
+# endif
+# endif
+#endif
/* Limits for the above types. */
#undef INT8_MIN
CF_CREATED /* file created, no data to extract */
};
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
#endif /* __bc_types_INCLUDED */