Fix conflict in libc

diff --cc basis/cocoa/messages/messages.factor
Simple merge

diff --cc basis/cocoa/views/views.factor
Simple merge

diff --cc basis/html/streams/streams.factor
Simple merge

diff --cc basis/html/templates/chloe/syntax/syntax.factor
Simple merge

diff --cc basis/libc/libc.factor
index 45365d4296021375801f6e0e5c3506a77cc5acf5,1e751833a22c759e3e3d0b9706032f260182ed3b..623d2f23afcc81d5c4787a7e3cc58311ceb90279
--- 1/basis/libc/libc.factor
--- 2/basis/libc/libc.factor
+++ b/basis/libc/libc.factor
@@@ -67,18 -67,22 +67,19 @@@ M: realloc-error summar
  PRIVATE>
  
  : malloc ( size -- alien )
 -    (malloc) check-ptr
 -    dup add-malloc ;
 +    (malloc) check-ptr add-malloc ;
  
  : calloc ( count size -- alien )
 -    (calloc) check-ptr
 -    dup add-malloc ;
 +    (calloc) check-ptr add-malloc ;
  
  : realloc ( alien size -- newalien )
+     [ >c-ptr ] dip
      over malloc-exists? [ realloc-error ] unless
 -    dupd (realloc) check-ptr
 -    swap delete-malloc
 -    dup add-malloc ;
 +    [ drop ] [ (realloc) check-ptr ] 2bi
 +    [ delete-malloc ] [ add-malloc ] bi* ;
  
  : free ( alien -- )
-     [ delete-malloc ] [ (free) ] bi ;
+     >c-ptr [ delete-malloc ] [ (free) ] bi ;
  
  : memcpy ( dst src size -- )
      "void" "libc" "memcpy" { "void*" "void*" "ulong" } alien-invoke ;

diff --cc basis/opengl/opengl.factor
index 620834c7d4285a970984b64371b24951509c4544,6d9ac95965767fbe5cb5245b78394f1919da6401..7dea8a0cdcffeec09270d2c33017715c1ec4cb87
--- 1/basis/opengl/opengl.factor
--- 2/basis/opengl/opengl.factor
+++ b/basis/opengl/opengl.factor
@@@ -174,10 -177,10 +174,10 @@@ MACRO: all-enabled-client-state ( seq q
      glActiveTexture swap glBindTexture gl-error ;
  
  : (set-draw-buffers) ( buffers -- )
-     [ length ] [ >uint-array underlying>> ] bi glDrawBuffers ;
+     [ length ] [ >uint-array ] bi glDrawBuffers ;
  
  MACRO: set-draw-buffers ( buffers -- )
 -    words>values [ (set-draw-buffers) ] curry ;
 +    words>values '[ _ (set-draw-buffers) ] ;
  
  : do-attribs ( bits quot -- )
      swap glPushAttrib call glPopAttrib ; inline

diff --cc basis/windows/com/wrapper/wrapper.factor
Simple merge

diff --cc basis/xml/tests/xmltest.factor
Simple merge

diff --cc basis/xml/writer/writer-tests.factor
Simple merge