Commit 83e68987 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Eliminate dependency on UNICODE macro.

parent 53bb3bee

crypto/dso/dso_win32.c

+19 −16
Original line number Diff line number Diff line
@@ -68,6 +68,25 @@ DSO_METHOD *DSO_METHOD_win32(void) 
	}

#else



#ifdef _WIN32_WCE

# if _WIN32_WCE < 300

static FARPROC GetProcAddressA(HMODULE hModule,LPCSTR lpProcName)

	{

	WCHAR lpProcNameW[64];

	int i;



	for (i=0;lpProcName[i] && i<64;i++)

		lpProcNameW[i] = (WCHAR)lpProcName[i];

	if (i==64) return NULL;

	lpProcNameW[i] = 0;



	return GetProcAddressW(hModule,lpProcNameW);

	}

# endif

# undef GetProcAddress

# define GetProcAddress GetProcAddressA

#endif



/* Part of the hack in "win32_load" ... */

#define DSO_MAX_TRANSLATED_SIZE 256
@@ -597,22 +616,6 @@ static const char *openssl_strnchr(const char *string, int c, size_t len) 


#include <tlhelp32.h>

#ifdef _WIN32_WCE

# if _WIN32_WCE < 300

static FARPROC GetProcAddressA(HMODULE hModule,LPCSTR lpProcName)

	{

	WCHAR lpProcNameW[64];

	int i;



	for (i=0;lpProcName[i] && i<64;i++)

		lpProcNameW[i] = (WCHAR)lpProcName[i];

	if (i==64) return NULL;

	lpProcNameW[i] = 0;



	return GetProcAddressW(hModule,lpProcNameW);

	}

# endif

# undef GetProcAddress

# define GetProcAddress GetProcAddressA

# define DLLNAME "TOOLHELP.DLL"

#else

# ifdef MODULEENTRY32

ssl/kssl.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ load_krb5_dll(void) 
	HANDLE hKRB5_32;

    

	krb5_loaded++;

	hKRB5_32 = LoadLibrary("KRB5_32");

	hKRB5_32 = LoadLibrary(TEXT("KRB5_32"));

	if (!hKRB5_32)

		return;