utils: Use RB_ prefixed ALLOCV,ALLOC_END

Signed-off-by: Hiroshi Hatake <[email protected]>

Author: cosmo0920

ext/winevt/extconf.rb

@@ -14,6 +14,9 @@
 have_func("EvtQuery", "winevt.h")
 have_library("advapi32")
 have_library("ole32")
+if have_macro("RB_ALLOCV")
+  $CFLAGS << " -DHAVE_RB_ALLOCV=1 "
+end
 
 $LDFLAGS << " -lwevtapi -ladvapi32 -lole32"
 $CFLAGS << " -Wall -std=c99 -fPIC -fms-extensions "

ext/winevt/winevt_c.h

@@ -16,6 +16,11 @@
 #endif /* WIN32_WINNT */
 #define _WIN32_WINNT MINIMUM_WINDOWS_VERSION
 
+#if !defined(HAVE_RB_ALLOCV)
+#define ALLOCV     RB_ALLOCV
+#define ALLOCV_N   RB_ALLOCV_N
+#endif
+
 #include <time.h>
 #include <winevt.h>
 #define EventQuery(object) ((struct WinevtQuery*)DATA_PTR(object))

ext/winevt/winevt_utils.cpp

@@ -660,7 +660,7 @@ static int ExpandSIDWString(PSID sid, CHAR **out_expanded)
   }
 
   result_len = strlen(domain) + 1 + strlen(account) + 1;
-  formatted = (CHAR *)ALLOCV(vformatted, result_len);
+  formatted = (CHAR *)RB_ALLOCV(vformatted, result_len);
   if (formatted == NULL) {
     goto error;
   }
@@ -675,7 +675,7 @@ static int ExpandSIDWString(PSID sid, CHAR **out_expanded)
   if (account != NULL) {
     free(account);
   }
-  ALLOCV_END(vformatted);
+  RB_ALLOCV_END(vformatted);
 
 
   return 0;