There have been a number of complaints from a number of sources that names
like Malloc, Realloc and especially Free conflict with already existing names on some operating systems or other packages. That is reason enough to change the names of the OpenSSL memory allocation macros to something that has a better chance of being unique, like prepending them with OPENSSL_. This change includes all the name changes needed throughout all C files.
This commit is contained in:
@@ -252,7 +252,7 @@ void RAND_screen(void)
|
||||
GetObject(hBitmap, sizeof(BITMAP), (LPSTR)&bm);
|
||||
size = (unsigned int)bm.bmWidthBytes * bm.bmHeight * bm.bmPlanes;
|
||||
|
||||
bmbits = Malloc(size);
|
||||
bmbits = OPENSSL_malloc(size);
|
||||
if (bmbits) {
|
||||
/* Now go through the whole screen, repeatedly grabbing n lines */
|
||||
for (y = 0; y < h-n; y += n)
|
||||
@@ -272,7 +272,7 @@ void RAND_screen(void)
|
||||
RAND_seed(md, MD_DIGEST_LENGTH);
|
||||
}
|
||||
|
||||
Free(bmbits);
|
||||
OPENSSL_free(bmbits);
|
||||
}
|
||||
|
||||
/* Select old bitmap back into memory DC */
|
||||
|
Reference in New Issue
Block a user