add Cwchar_t and update docs. closes JuliaLang#2907

jiahao · Apr 22, 2013 · 27cf333 · 27cf333
1 parent d7b6138
commit 27cf333
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/base/c.jl b/base/c.jl
@@ -44,9 +44,11 @@ typealias Cuint Uint32
 if OS_NAME === :Windows
  typealias Clong Int32
  typealias Culong Uint32
+ typealias Cwchar_t Uint16
 else
  typealias Clong Int
  typealias Culong Uint
+ typealias Cwchar_t Int32
 end
 typealias Cptrdiff_t Int
 typealias Csize_t Uint

diff --git a/base/exports.jl b/base/exports.jl
@@ -144,6 +144,7 @@ export
  Culonglong,
  Cfloat,
  Cdouble,
+ Cwchar_t,
  #Ccomplex_float,
  #Ccomplex_double,
 

diff --git a/doc/manual/calling-c-and-fortran-code.rst b/doc/manual/calling-c-and-fortran-code.rst
@@ -234,6 +234,8 @@ Julia type with the same name, prefixed by C. This can help for writing portable
 +------------------------+-------------------+--------------------------------+
 | ``ptrdiff_t`` | ``Cptrdiff_t`` | ``Int`` |
 +------------------------+-------------------+--------------------------------+
+| ``ssize_t`` | ``Cssize_t`` | ``Int`` |
++------------------------+-------------------+--------------------------------+
 | ``size_t`` | ``Csize_t`` | ``Uint`` |
 +------------------------+-------------------+--------------------------------+
 | ``complex float`` | ``Ccomplex_float`` (future addition) |
@@ -264,6 +266,9 @@ wide. In C, however, ``int`` is often used for boolean values. Since
 ``int`` is 32-bits wide (on all supported systems), there is some
 potential for confusion here.
 
+Julia's ``Char`` type is 32 bits, which is not the same as the wide
+character type (``wchar_t`` or ``wint_t``) on all platforms.
+
 A C function declared to return ``void`` will give ``nothing`` in Julia.
 
 **System-dependent:**
@@ -277,11 +282,10 @@ A C function declared to return ``void`` will give ``nothing`` in Julia.
  ``Int32`` (Windows)
 ``unsigned long`` ``Culong`` ``Uint`` (UNIX)
 
- ``Int32`` (Windows)
-``wchar_t`` ``Char`` Although ``wchar_t`` is technically
- system-dependent, on all the
- systems we currently support (UNIX),
- it is 32-bit.
+ ``Uint32`` (Windows)
+``wchar_t`` ``Cwchar_t`` ``Int32`` (UNIX)
+
+ ``Uint16`` (Windows)
 ====================== ============== =======
 
 For string arguments (``char*``) the Julia type should be ``Ptr{Uint8}``,