Fix compile errors

panda3d · Nov 24, 2017 · 409b241 · 409b241
1 parent d755de8
commit 409b241
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/direct/src/showutil/FreezeTool.py b/direct/src/showutil/FreezeTool.py
@@ -1830,7 +1830,7 @@ def _replace_symbol(self, data, symbol_name, replacement):
 
         elif data[:4] in (b'\xFE\xED\xFA\xCE', b'\xCE\xFA\xED\xFE',
                           b'\xFE\xED\xFA\xCF', b'\xCF\xFA\xED\xFE'):
-            off = self._find_symbol_macho(macho_data, symbol_name)
+            off = self._find_symbol_macho(data, symbol_name)
             if off is not None:
                 data[off:off+len(replacement)] = replacement
                 return True

diff --git a/dtool/src/prc/configPageManager.cxx b/dtool/src/prc/configPageManager.cxx
@@ -117,8 +117,10 @@ reload_implicit_pages() {
   };
 #ifdef _MSC_VER
   const BlobInfo *blobinfo = (const BlobInfo *)GetProcAddress(GetModuleHandle(NULL), "blobinfo");
-#else
+#elif defined(RTLD_SELF)
   const BlobInfo *blobinfo = (const BlobInfo *)dlsym(RTLD_SELF, "blobinfo");
+#else
+  const BlobInfo *blobinfo = (const BlobInfo *)dlsym(dlopen(NULL, RTLD_NOW), "blobinfo");
 #endif
   if (blobinfo != nullptr && (blobinfo->version == 0 || blobinfo->num_pointers < 10)) {
     blobinfo = nullptr;

diff --git a/pandatool/src/deploy-stub/deploy-stub.c b/pandatool/src/deploy-stub/deploy-stub.c
@@ -362,9 +362,9 @@ int main(int argc, char *argv[]) {
   }
 
 #ifdef _WIN32
-  if (codepage != 0) {
-    SetConsoleCP(codepage);
-    SetConsoleOutputCP(codepage);
+  if (blobinfo.codepage != 0) {
+    SetConsoleCP(blobinfo.codepage);
+    SetConsoleOutputCP(blobinfo.codepage);
   }
 #endif