Only define illumos-compat functions on non-illumos platforms

arekinath · May 8, 2019 · 94d4571 · 94d4571
1 parent 619c926
commit 94d4571
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/debug.c b/debug.c
@@ -42,6 +42,7 @@
 
 #include "libssh/ssherr.h"
 
+#if !defined(__sun)
 static void
 ultos(uint64_t n, int base, char *s)
 {
@@ -105,6 +106,7 @@ assfail3(const char *assertion, uintmax_t lv, const char *op, uintmax_t rv,
 	(void) strcat(buf, ")");
 	assfail(buf, filename, line_num);
 }
+#endif
 
 const char *
 ssh_err(int n)

diff --git a/debug.h b/debug.h
@@ -7,19 +7,19 @@ extern "C" {
 
 #include <stdint.h>
 
+#if defined(__sun)
+#include <sys/debug.h>
+#else
+
 #if !defined(__APPLE__)
 typedef uint64_t uintmax_t;
 #endif
 
-#if !defined(__sun) && !defined(USING_SPL)
+#if !defined(USING_SPL)
 typedef /*@concrete@*/ enum { B_FALSE = 0, B_TRUE = 1 } boolean_t;
 typedef /*@concrete@*/ unsigned int uint;
 #endif
 
-#if defined(__sun)
-#include <sys/types.h>
-#endif
-
 #undef VERIFY
 #undef ASSERT
 
@@ -150,6 +150,8 @@ extern void debug_enter(char *);
 #define STATIC static
 #endif
 
+#endif /* defined(__sun) */
+
 #ifdef  __cplusplus
 }
 #endif