lib/wrappers/c-r - Dropped 'T' from types

1 files changed, 135 insertions, 117 deletions

diff --git a/lib/wrappers/libcurl.nim b/lib/wrappers/libcurl.nim
index 8c962f6cb..924879e75 100644
--- a/lib/wrappers/libcurl.nim
+++ b/lib/wrappers/libcurl.nim
@@ -31,47 +31,47 @@ elif defined(unix):
   const 
     libname = "libcurl.so.4"
 type 
-  Pcalloc_callback* = ptr Tcalloc_callback
-  Pclosepolicy* = ptr Tclosepolicy
-  Pforms* = ptr Tforms
-  Pftpauth* = ptr Tftpauth
-  Pftpmethod* = ptr Tftpmethod
-  Pftpssl* = ptr Tftpssl
-  PHTTP_VERSION* = ptr THTTP_VERSION
-  Phttppost* = ptr Thttppost
+  Pcalloc_callback* = ptr Calloc_callback
+  Pclosepolicy* = ptr Closepolicy
+  Pforms* = ptr Forms
+  Pftpauth* = ptr Ftpauth
+  Pftpmethod* = ptr Ftpmethod
+  Pftpssl* = ptr Ftpssl
+  PHTTP_VERSION* = ptr HTTP_VERSION
+  Phttppost* = ptr Httppost
   PPcurl_httppost* = ptr Phttppost
-  Pinfotype* = ptr Tinfotype
-  Plock_access* = ptr Tlock_access
-  Plock_data* = ptr Tlock_data
-  Pmalloc_callback* = ptr Tmalloc_callback
-  PNETRC_OPTION* = ptr TNETRC_OPTION
-  Pproxytype* = ptr Tproxytype
-  Prealloc_callback* = ptr Trealloc_callback
-  Pslist* = ptr Tslist
-  Psocket* = ptr Tsocket
-  PSSL_VERSION* = ptr TSSL_VERSION
-  Pstrdup_callback* = ptr Tstrdup_callback
-  PTIMECOND* = ptr TTIMECOND
-  Pversion_info_data* = ptr Tversion_info_data
-  Pcode* = ptr Tcode
-  PFORMcode* = ptr TFORMcode
-  Pformoption* = ptr Tformoption
-  PINFO* = ptr TINFO
-  Piocmd* = ptr Tiocmd
-  Pioerr* = ptr Tioerr
-  PM* = ptr TM
-  PMcode* = ptr TMcode
-  PMoption* = ptr TMoption
-  PMSG* = ptr TMSG
-  Poption* = ptr Toption
-  PSH* = ptr TSH
-  PSHcode* = ptr TSHcode
-  PSHoption* = ptr TSHoption
-  Pversion* = ptr Tversion
+  Pinfotype* = ptr Infotype
+  Plock_access* = ptr Lock_access
+  Plock_data* = ptr Lock_data
+  Pmalloc_callback* = ptr Malloc_callback
+  PNETRC_OPTION* = ptr NETRC_OPTION
+  Pproxytype* = ptr Proxytype
+  Prealloc_callback* = ptr Realloc_callback
+  Pslist* = ptr Slist
+  Psocket* = ptr Socket
+  PSSL_VERSION* = ptr SSL_VERSION
+  Pstrdup_callback* = ptr Strdup_callback
+  PTIMECOND* = ptr TIMECOND
+  Pversion_info_data* = ptr Version_info_data
+  Pcode* = ptr Code
+  PFORMcode* = ptr FORMcode
+  Pformoption* = ptr Formoption
+  PINFO* = ptr INFO
+  Piocmd* = ptr Iocmd
+  Pioerr* = ptr Ioerr
+  PM* = ptr M
+  PMcode* = ptr Mcode
+  PMoption* = ptr Moption
+  PMSG* = ptr MSG
+  Poption* = ptr Option
+  PSH* = ptr SH
+  PSHcode* = ptr SHcode
+  PSHoption* = ptr SHoption
+  Pversion* = ptr Version
   Pfd_set* = pointer
-  PCurl* = ptr TCurl
-  TCurl* = pointer
-  Thttppost*{.final, pure.} = object 
+  PCurl* = ptr Curl
+  Curl* = pointer
+  Httppost*{.final, pure.} = object 
     next*: Phttppost
     name*: cstring
     namelength*: int32
@@ -85,32 +85,32 @@ type
     flags*: int32
     showfilename*: cstring
 
-  Tprogress_callback* = proc (clientp: pointer, dltotal: float64, 
+  Progress_callback* = proc (clientp: pointer, dltotal: float64, 
                               dlnow: float64, ultotal: float64, 
                               ulnow: float64): int32 {.cdecl.}
-  Twrite_callback* = proc (buffer: cstring, size: int, nitems: int, 
+  Write_callback* = proc (buffer: cstring, size: int, nitems: int, 
                            outstream: pointer): int{.cdecl.}
-  Tread_callback* = proc (buffer: cstring, size: int, nitems: int, 
+  Read_callback* = proc (buffer: cstring, size: int, nitems: int, 
                           instream: pointer): int{.cdecl.}
-  Tpasswd_callback* = proc (clientp: pointer, prompt: cstring, buffer: cstring, 
+  Passwd_callback* = proc (clientp: pointer, prompt: cstring, buffer: cstring, 
                             buflen: int32): int32{.cdecl.}
-  Tioerr* = enum 
+  Ioerr* = enum 
     IOE_OK, IOE_UNKNOWNCMD, IOE_FAILRESTART, IOE_LAST
-  Tiocmd* = enum 
+  Iocmd* = enum 
     IOCMD_NOP, IOCMD_RESTARTREAD, IOCMD_LAST
-  Tioctl_callback* = proc (handle: PCurl, cmd: int32, clientp: pointer): Tioerr{.
+  Ioctl_callback* = proc (handle: PCurl, cmd: int32, clientp: pointer): Ioerr{.
       cdecl.}
-  Tmalloc_callback* = proc (size: int): pointer{.cdecl.}
-  Tfree_callback* = proc (p: pointer){.cdecl.}
-  Trealloc_callback* = proc (p: pointer, size: int): pointer{.cdecl.}
-  Tstrdup_callback* = proc (str: cstring): cstring{.cdecl.}
-  Tcalloc_callback* = proc (nmemb: int, size: int): pointer{.noconv.}
-  Tinfotype* = enum 
+  Malloc_callback* = proc (size: int): pointer{.cdecl.}
+  Free_callback* = proc (p: pointer){.cdecl.}
+  Realloc_callback* = proc (p: pointer, size: int): pointer{.cdecl.}
+  Strdup_callback* = proc (str: cstring): cstring{.cdecl.}
+  Calloc_callback* = proc (nmemb: int, size: int): pointer{.noconv.}
+  Infotype* = enum 
     INFO_TEXT = 0, INFO_HEADER_IN, INFO_HEADER_OUT, INFO_DATA_IN, INFO_DATA_OUT, 
     INFO_SSL_DATA_IN, INFO_SSL_DATA_OUT, INFO_END
-  Tdebug_callback* = proc (handle: PCurl, theType: Tinfotype, data: cstring, 
+  Debug_callback* = proc (handle: PCurl, theType: Infotype, data: cstring, 
                            size: int, userptr: pointer): int32{.cdecl.}
-  Tcode* = enum 
+  Code* = enum 
     E_OK = 0, E_UNSUPPORTED_PROTOCOL, E_FAILED_INIT, E_URL_MALFORMAT, 
     E_URL_MALFORMAT_USER, E_COULDNT_RESOLVE_PROXY, E_COULDNT_RESOLVE_HOST, 
     E_COULDNT_CONNECT, E_FTP_WEIRD_SERVER_REPLY, E_FTP_ACCESS_DENIED, 
@@ -135,18 +135,18 @@ type
     E_LOGIN_DENIED, E_TFTP_NOTFOUND, E_TFTP_PERM, E_TFTP_DISKFULL, 
     E_TFTP_ILLEGAL, E_TFTP_UNKNOWNID, E_TFTP_EXISTS, E_TFTP_NOSUCHUSER, 
     E_CONV_FAILED, E_CONV_REQD, LAST
-  Tconv_callback* = proc (buffer: cstring, len: int): Tcode{.cdecl.}
-  Tssl_ctx_callback* = proc (curl: PCurl, ssl_ctx, userptr: pointer): Tcode{.cdecl.}
-  Tproxytype* = enum 
+  Conv_callback* = proc (buffer: cstring, len: int): Code{.cdecl.}
+  Ssl_ctx_callback* = proc (curl: PCurl, ssl_ctx, userptr: pointer): Code{.cdecl.}
+  Proxytype* = enum 
     PROXY_HTTP = 0, PROXY_SOCKS4 = 4, PROXY_SOCKS5 = 5
-  Tftpssl* = enum 
+  Ftpssl* = enum 
     FTPSSL_NONE, FTPSSL_TRY, FTPSSL_CONTROL, FTPSSL_ALL, FTPSSL_LAST
-  Tftpauth* = enum 
+  Ftpauth* = enum 
     FTPAUTH_DEFAULT, FTPAUTH_SSL, FTPAUTH_TLS, FTPAUTH_LAST
-  Tftpmethod* = enum 
+  Ftpmethod* = enum 
     FTPMETHOD_DEFAULT, FTPMETHOD_MULTICWD, FTPMETHOD_NOCWD, FTPMETHOD_SINGLECWD, 
     FTPMETHOD_LAST
-  Toption* = enum 
+  Option* = enum 
     OPT_PORT = 0 + 3, OPT_TIMEOUT = 0 + 13, OPT_INFILESIZE = 0 + 14, 
     OPT_LOW_SPEED_LIMIT = 0 + 19, OPT_LOW_SPEED_TIME = 0 + 20, 
     OPT_RESUME_FROM = 0 + 21, OPT_CRLF = 0 + 27, OPT_SSLVERSION = 0 + 32, 
@@ -211,37 +211,37 @@ type
     OPT_MAXFILESIZE_LARGE = 30000 + 117, OPT_POSTFIELDSIZE_LARGE = 30000 + 120, 
     OPT_MAX_SEND_SPEED_LARGE = 30000 + 145, 
     OPT_MAX_RECV_SPEED_LARGE = 30000 + 146
-  THTTP_VERSION* = enum 
+  HTTP_VERSION* = enum 
     HTTP_VERSION_NONE, HTTP_VERSION_1_0, HTTP_VERSION_1_1, HTTP_VERSION_LAST
-  TNETRC_OPTION* = enum 
+  NETRC_OPTION* = enum 
     NETRC_IGNORED, NETRC_OPTIONAL, NETRC_REQUIRED, NETRC_LAST
-  TSSL_VERSION* = enum 
+  SSL_VERSION* = enum 
     SSLVERSION_DEFAULT, SSLVERSION_TLSv1, SSLVERSION_SSLv2, SSLVERSION_SSLv3, 
     SSLVERSION_LAST
-  TTIMECOND* = enum 
+  TIMECOND* = enum 
     TIMECOND_NONE, TIMECOND_IFMODSINCE, TIMECOND_IFUNMODSINCE, TIMECOND_LASTMOD, 
     TIMECOND_LAST
-  Tformoption* = enum 
+  Formoption* = enum 
     FORM_NOTHING, FORM_COPYNAME, FORM_PTRNAME, FORM_NAMELENGTH, 
     FORM_COPYCONTENTS, FORM_PTRCONTENTS, FORM_CONTENTSLENGTH, FORM_FILECONTENT, 
     FORM_ARRAY, FORM_OBSOLETE, FORM_FILE, FORM_BUFFER, FORM_BUFFERPTR, 
     FORM_BUFFERLENGTH, FORM_CONTENTTYPE, FORM_CONTENTHEADER, FORM_FILENAME, 
     FORM_END, FORM_OBSOLETE2, FORM_LASTENTRY
-  Tforms*{.pure, final.} = object 
-    option*: Tformoption
+  Forms*{.pure, final.} = object 
+    option*: Formoption
     value*: cstring
 
-  TFORMcode* = enum 
+  FORMcode* = enum 
     FORMADD_OK, FORMADD_MEMORY, FORMADD_OPTION_TWICE, FORMADD_NULL, 
     FORMADD_UNKNOWN_OPTION, FORMADD_INCOMPLETE, FORMADD_ILLEGAL_ARRAY, 
     FORMADD_DISABLED, FORMADD_LAST
-  Tformget_callback* = proc (arg: pointer, buf: cstring, length: int): int{.
+  Formget_callback* = proc (arg: pointer, buf: cstring, length: int): int{.
       cdecl.}
-  Tslist*{.pure, final.} = object 
+  Slist*{.pure, final.} = object 
     data*: cstring
     next*: Pslist
 
-  TINFO* = enum 
+  INFO* = enum 
     INFO_NONE = 0, INFO_LASTONE = 30, INFO_EFFECTIVE_URL = 0x00100000 + 1, 
     INFO_CONTENT_TYPE = 0x00100000 + 18, INFO_PRIVATE = 0x00100000 + 21, 
     INFO_FTP_ENTRY_PATH = 0x00100000 + 30, INFO_RESPONSE_CODE = 0x00200000 + 2, 
@@ -261,31 +261,31 @@ type
     INFO_STARTTRANSFER_TIME = 0x00300000 + 17, 
     INFO_REDIRECT_TIME = 0x00300000 + 19, INFO_SSL_ENGINES = 0x00400000 + 27, 
     INFO_COOKIELIST = 0x00400000 + 28
-  Tclosepolicy* = enum 
+  Closepolicy* = enum 
     CLOSEPOLICY_NONE, CLOSEPOLICY_OLDEST, CLOSEPOLICY_LEAST_RECENTLY_USED, 
     CLOSEPOLICY_LEAST_TRAFFIC, CLOSEPOLICY_SLOWEST, CLOSEPOLICY_CALLBACK, 
     CLOSEPOLICY_LAST
-  Tlock_data* = enum 
+  Lock_data* = enum 
     LOCK_DATA_NONE = 0, LOCK_DATA_SHARE, LOCK_DATA_COOKIE, LOCK_DATA_DNS, 
     LOCK_DATA_SSL_SESSION, LOCK_DATA_CONNECT, LOCK_DATA_LAST
-  Tlock_access* = enum 
+  Lock_access* = enum 
     LOCK_ACCESS_NONE = 0, LOCK_ACCESS_SHARED = 1, LOCK_ACCESS_SINGLE = 2, 
     LOCK_ACCESS_LAST
-  Tlock_function* = proc (handle: PCurl, data: Tlock_data,
-                          locktype: Tlock_access, 
+  Lock_function* = proc (handle: PCurl, data: Lock_data,
+                          locktype: Lock_access, 
                           userptr: pointer){.cdecl.}
-  Tunlock_function* = proc (handle: PCurl, data: Tlock_data, userptr: pointer){.
+  Unlock_function* = proc (handle: PCurl, data: Lock_data, userptr: pointer){.
       cdecl.}
-  TSH* = pointer
-  TSHcode* = enum 
+  SH* = pointer
+  SHcode* = enum 
     SHE_OK, SHE_BAD_OPTION, SHE_IN_USE, SHE_INVALID, SHE_NOMEM, SHE_LAST
-  TSHoption* = enum 
+  SHoption* = enum 
     SHOPT_NONE, SHOPT_SHARE, SHOPT_UNSHARE, SHOPT_LOCKFUNC, SHOPT_UNLOCKFUNC, 
     SHOPT_USERDATA, SHOPT_LAST
-  Tversion* = enum 
+  Version* = enum 
     VERSION_FIRST, VERSION_SECOND, VERSION_THIRD, VERSION_LAST
-  Tversion_info_data*{.pure, final.} = object 
-    age*: Tversion
+  Version_info_data*{.pure, final.} = object 
+    age*: Version
     version*: cstring
     version_num*: int32
     host*: cstring
@@ -299,15 +299,15 @@ type
     libidn*: cstring
     iconv_ver_num*: int32
 
-  TM* = pointer
-  Tsocket* = int32
-  TMcode* = enum 
+  M* = pointer
+  Socket* = int32
+  Mcode* = enum 
     M_CALL_MULTI_PERFORM = - 1, M_OK = 0, M_BAD_HANDLE, M_BAD_EASY_HANDLE, 
     M_OUT_OF_MEMORY, M_INTERNAL_ERROR, M_BAD_SOCKET, M_UNKNOWN_OPTION, M_LAST
-  TMSGEnum* = enum 
+  MSGEnum* = enum 
     MSG_NONE, MSG_DONE, MSG_LAST
-  TMsg*{.pure, final.} = object 
-    msg*: TMSGEnum
+  Msg*{.pure, final.} = object 
+    msg*: MSGEnum
     easy_handle*: PCurl
     whatever*: pointer        #data : record
                               #      case longint of
@@ -315,11 +315,29 @@ type
                               #        1 : ( result : CURLcode );
                               #    end;
   
-  Tsocket_callback* = proc (easy: PCurl, s: Tsocket, what: int32, 
+  Socket_callback* = proc (easy: PCurl, s: Socket, what: int32, 
                             userp, socketp: pointer): int32{.cdecl.}
-  TMoption* = enum 
+  Moption* = enum 
     MOPT_SOCKETDATA = 10000 + 2, MOPT_LASTENTRY = 10000 + 3, 
     MOPT_SOCKETFUNCTION = 20000 + 1
+{.deprecated: [TMsg: Msg, TCurl: Curl, Thttppost: Httppost,
+    Tprogress_callback: Progress_callback, Twrite_callback: Write_callback,
+    Tread_callback: Read_callback, Tpasswd_callback: Passwd_callback, Tioerr: Ioerr,
+    Tiocmd: Iocmd, Tioctl_callback: Ioctl_callback, Tmalloc_callback: Malloc_callback,
+    Tfree_callback: Free_callback, Trealloc_callback: Realloc_callback,
+    Tstrdup_callback: Strdup_callback, Tcalloc_callback: Calloc_callback,
+    Tinfotype: Infotype, Tdebug_callback: Debug_callback, Tcode: Code,
+    Tconv_callback: Conv_callback, Tssl_ctx_callback: Ssl_ctx_callback,
+    Tproxytype: Proxytype, Tftpssl: Ftpssl, Tftpauth: Ftpauth, Tftpmethod: Ftpmethod,
+    Toption: Option, THTTP_VERSION: HTTP_VERSION, TNETRC_OPTION: NETRC_OPTION,
+    TSSL_VERSION: SSL_VERSION, TTIMECOND: TIMECOND, Tformoption: Formoption,
+    Tforms: Forms, TFORMcode: FORMcode, Tformget_callback: Formget_callback,
+    Tslist: Slist, TINFO: INFO, Tclosepolicy: Closepolicy, Tlock_data: Lock_data,
+    Tlock_access: Lock_access, Tlock_function: Lock_function,
+    Tunlock_function: Unlock_function, TSH: Sh, TSHcode: SHcode, TSHoption: SHoption,
+    Tversion: Version, Tversion_info_data: Version_info_data, TM: M, Tsocket: Socket,
+    TMcode: Mcode, TMSGEnum: MsGEnum, Tsocket_callback: Socket_callback,
+    TMoption: Moption].}
 
 const 
   OPT_SSLKEYPASSWD* = OPT_SSLCERTPASSWD
@@ -413,9 +431,9 @@ proc strequal*(s1, s2: cstring): int32{.cdecl, dynlib: libname,
                                         importc: "curl_strequal".}
 proc strnequal*(s1, s2: cstring, n: int): int32{.cdecl, dynlib: libname, 
     importc: "curl_strnequal".}
-proc formadd*(httppost, last_post: PPcurl_httppost): TFORMcode{.cdecl, varargs, 
+proc formadd*(httppost, last_post: PPcurl_httppost): FORMcode{.cdecl, varargs, 
     dynlib: libname, importc: "curl_formadd".}
-proc formget*(form: Phttppost, arg: pointer, append: Tformget_callback): int32{.
+proc formget*(form: Phttppost, arg: pointer, append: Formget_callback): int32{.
     cdecl, dynlib: libname, importc: "curl_formget".}
 proc formfree*(form: Phttppost){.cdecl, dynlib: libname, 
                                  importc: "curl_formfree".}
@@ -431,11 +449,11 @@ proc easy_unescape*(handle: PCurl, str: cstring, len: int32, outlength: var int3
 proc unescape*(str: cstring, len: int32): cstring{.cdecl, dynlib: libname, 
     importc: "curl_unescape".}
 proc free*(p: pointer){.cdecl, dynlib: libname, importc: "curl_free".}
-proc global_init*(flags: int32): Tcode{.cdecl, dynlib: libname, 
+proc global_init*(flags: int32): Code{.cdecl, dynlib: libname, 
                                         importc: "curl_global_init".}
-proc global_init_mem*(flags: int32, m: Tmalloc_callback, f: Tfree_callback, 
-                      r: Trealloc_callback, s: Tstrdup_callback, 
-                      c: Tcalloc_callback): Tcode{.cdecl, dynlib: libname, 
+proc global_init_mem*(flags: int32, m: Malloc_callback, f: Free_callback, 
+                      r: Realloc_callback, s: Strdup_callback, 
+                      c: Calloc_callback): Code{.cdecl, dynlib: libname, 
     importc: "curl_global_init_mem".}
 proc global_cleanup*(){.cdecl, dynlib: libname, importc: "curl_global_cleanup".}
 proc slist_append*(slist: Pslist, p: cstring): Pslist{.cdecl, dynlib: libname, 
@@ -445,50 +463,50 @@ proc slist_free_all*(para1: Pslist){.cdecl, dynlib: libname,
 proc getdate*(p: cstring, unused: ptr Time): Time{.cdecl, dynlib: libname, 
     importc: "curl_getdate".}
 proc share_init*(): PSH{.cdecl, dynlib: libname, importc: "curl_share_init".}
-proc share_setopt*(para1: PSH, option: TSHoption): TSHcode{.cdecl, varargs, 
+proc share_setopt*(para1: PSH, option: SHoption): SHcode{.cdecl, varargs, 
     dynlib: libname, importc: "curl_share_setopt".}
-proc share_cleanup*(para1: PSH): TSHcode{.cdecl, dynlib: libname, 
+proc share_cleanup*(para1: PSH): SHcode{.cdecl, dynlib: libname, 
     importc: "curl_share_cleanup".}
-proc version_info*(para1: Tversion): Pversion_info_data{.cdecl, dynlib: libname, 
+proc version_info*(para1: Version): Pversion_info_data{.cdecl, dynlib: libname, 
     importc: "curl_version_info".}
-proc easy_strerror*(para1: Tcode): cstring{.cdecl, dynlib: libname, 
+proc easy_strerror*(para1: Code): cstring{.cdecl, dynlib: libname, 
     importc: "curl_easy_strerror".}
-proc share_strerror*(para1: TSHcode): cstring{.cdecl, dynlib: libname, 
+proc share_strerror*(para1: SHcode): cstring{.cdecl, dynlib: libname, 
     importc: "curl_share_strerror".}
 proc easy_init*(): PCurl{.cdecl, dynlib: libname, importc: "curl_easy_init".}
-proc easy_setopt*(curl: PCurl, option: Toption): Tcode{.cdecl, varargs, dynlib: libname, 
+proc easy_setopt*(curl: PCurl, option: Option): Code{.cdecl, varargs, dynlib: libname, 
     importc: "curl_easy_setopt".}
-proc easy_perform*(curl: PCurl): Tcode{.cdecl, dynlib: libname, 
+proc easy_perform*(curl: PCurl): Code{.cdecl, dynlib: libname, 
                                 importc: "curl_easy_perform".}
 proc easy_cleanup*(curl: PCurl){.cdecl, dynlib: libname, importc: "curl_easy_cleanup".}
-proc easy_getinfo*(curl: PCurl, info: TINFO): Tcode{.cdecl, varargs, dynlib: libname, 
+proc easy_getinfo*(curl: PCurl, info: INFO): Code{.cdecl, varargs, dynlib: libname, 
     importc: "curl_easy_getinfo".}
 proc easy_duphandle*(curl: PCurl): PCurl{.cdecl, dynlib: libname, 
                               importc: "curl_easy_duphandle".}
 proc easy_reset*(curl: PCurl){.cdecl, dynlib: libname, importc: "curl_easy_reset".}
 proc multi_init*(): PM{.cdecl, dynlib: libname, importc: "curl_multi_init".}
-proc multi_add_handle*(multi_handle: PM, handle: PCurl): TMcode{.cdecl, 
+proc multi_add_handle*(multi_handle: PM, handle: PCurl): Mcode{.cdecl, 
     dynlib: libname, importc: "curl_multi_add_handle".}
-proc multi_remove_handle*(multi_handle: PM, handle: PCurl): TMcode{.cdecl, 
+proc multi_remove_handle*(multi_handle: PM, handle: PCurl): Mcode{.cdecl, 
     dynlib: libname, importc: "curl_multi_remove_handle".}
 proc multi_fdset*(multi_handle: PM, read_fd_set: Pfd_set, write_fd_set: Pfd_set, 
-                  exc_fd_set: Pfd_set, max_fd: var int32): TMcode{.cdecl, 
+                  exc_fd_set: Pfd_set, max_fd: var int32): Mcode{.cdecl, 
     dynlib: libname, importc: "curl_multi_fdset".}
-proc multi_perform*(multi_handle: PM, running_handles: var int32): TMcode{.
+proc multi_perform*(multi_handle: PM, running_handles: var int32): Mcode{.
     cdecl, dynlib: libname, importc: "curl_multi_perform".}
-proc multi_cleanup*(multi_handle: PM): TMcode{.cdecl, dynlib: libname, 
+proc multi_cleanup*(multi_handle: PM): Mcode{.cdecl, dynlib: libname, 
     importc: "curl_multi_cleanup".}
 proc multi_info_read*(multi_handle: PM, msgs_in_queue: var int32): PMsg{.cdecl, 
     dynlib: libname, importc: "curl_multi_info_read".}
-proc multi_strerror*(para1: TMcode): cstring{.cdecl, dynlib: libname, 
+proc multi_strerror*(para1: Mcode): cstring{.cdecl, dynlib: libname, 
     importc: "curl_multi_strerror".}
-proc multi_socket*(multi_handle: PM, s: Tsocket, running_handles: var int32): TMcode{.
+proc multi_socket*(multi_handle: PM, s: Socket, running_handles: var int32): Mcode{.
     cdecl, dynlib: libname, importc: "curl_multi_socket".}
-proc multi_socket_all*(multi_handle: PM, running_handles: var int32): TMcode{.
+proc multi_socket_all*(multi_handle: PM, running_handles: var int32): Mcode{.
     cdecl, dynlib: libname, importc: "curl_multi_socket_all".}
-proc multi_timeout*(multi_handle: PM, milliseconds: var int32): TMcode{.cdecl, 
+proc multi_timeout*(multi_handle: PM, milliseconds: var int32): Mcode{.cdecl, 
     dynlib: libname, importc: "curl_multi_timeout".}
-proc multi_setopt*(multi_handle: PM, option: TMoption): TMcode{.cdecl, varargs, 
+proc multi_setopt*(multi_handle: PM, option: Moption): Mcode{.cdecl, varargs, 
     dynlib: libname, importc: "curl_multi_setopt".}
-proc multi_assign*(multi_handle: PM, sockfd: Tsocket, sockp: pointer): TMcode{.
+proc multi_assign*(multi_handle: PM, sockfd: Socket, sockp: pointer): Mcode{.
     cdecl, dynlib: libname, importc: "curl_multi_assign".}