Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/ws2_32/protocol.cpp

    r8055 r21916  
    2828#include <wchar.h>
    2929
     30#ifdef __EMX__
     31// EMX currently lacks POSIX swprintf, use snwprinf from NTDLL
     32#include <minivcrt.h>
     33#endif
     34
    3035//#include "nspapi.h"
    3136
    … …  
    291296      // recalculate LANA -> iProtocol
    292297      lpBuffer->iProtocol = pBinding->pLANA->encLANA;
    293      
     298
     299#ifdef __EMX__
     300      snwprintf(szBuf,
     301                256, // sizeof szBuf
     302                pBinding->pProtocol->szProtocol,
     303                pBinding->pLANA->lpszGUID,
     304                pBinding->pLANA->LANA);
     305#else
    294306      swprintf((wchar_t*)szBuf,
    295307               256, // sizeof szBuf
    … …  
    297309               pBinding->pLANA->lpszGUID,
    298310               pBinding->pLANA->LANA);
    299      
     311#endif
     312
    300313      lpProtName = szBuf;
    301314    }
Note: See TracChangeset for help on using the changeset viewer.