bugfix: wrong assertions for C++ code generation; some solaris support; first steps to an effect system

2 files changed, 5 insertions, 0 deletions

diff --git a/lib/nimbase.h b/lib/nimbase.h
index 69aa904db..74dd931e6 100755
--- a/lib/nimbase.h
+++ b/lib/nimbase.h
@@ -470,4 +470,6 @@ static inline void GCGuard (void *ptr) { asm volatile ("" :: "X" (ptr)); }
 #  define GC_GUARD
 #endif
 
+typedef int assert_numbits[sizeof(NI) == sizeof(void*) &&
+                           NIM_INTBITS == sizeof(NI)*8 ? 1 : -1];
 #endif
diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim
index 4782ddd2e..f0d4cb6b8 100755
--- a/lib/pure/sockets.nim
+++ b/lib/pure/sockets.nim
@@ -24,6 +24,9 @@ when defined(Windows):
   import winlean
 else:
   import posix
+  
+  when defined(solaris):
+    {.passl: "-lsocket -lnsl".}
 
 # Note: The enumerations are mapped to Window's constants.