Revert Chia changes

dvarrazzo · Jan 29, 2021 · cf9c351 · cf9c351
1 parent 8da9925
commit cf9c351
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/src/spt_python.h b/src/spt_python.h
@@ -16,7 +16,9 @@
 #include <Python.h>
 
 /* Things change a lot here... */
+#if PY_MAJOR_VERSION >= 3
 #define IS_PY3K
+#endif
 
 /* Detect pypy */
 #ifdef PYPY_VERSION

diff --git a/src/spt_setup.c b/src/spt_setup.c
@@ -357,14 +357,6 @@ get_args_from_proc(int *argc_o, char **arg0_o)
     return rv;
 }
 
-static int getargcargv(int* argc, char*** argv) {
-#ifdef __APPLE__
-
-  return 0;
-#endif
-  return -1;
-}
-
 /* Find the original arg buffer, return 0 if found, else -1.
  *
  * If found, set argc to the number of arguments, argv to an array
@@ -390,10 +382,8 @@ get_argc_argv(int *argc_o, char ***argv_o)
     int rv = -1;
 
 #ifndef IS_PYPY
-#ifndef __APPLE__
     spt_debug("reading argc/argv from Python main");
     Py_GetArgcArgv(&argc, &argv_py);
-#endif
 #endif
 
     if (argc > 0) {
@@ -420,18 +410,8 @@ get_argc_argv(int *argc_o, char ***argv_o)
         /* get a copy of argv[0] from /proc, so we get back in the same
          * situation of Py3 */
         if (0 > get_args_from_proc(&argc, &arg0)) {
-            spt_debug("reading argc/argv from Python main");
-#ifdef __APPLE__
-            argv = *_NSGetArgv();
-            argc = *_NSGetArgc();
-            if (argc == 0) {
-                spt_debug("failed to get args from proc fs");
-                goto exit;
-            }
-#else
             spt_debug("failed to get args from proc fs");
             goto exit;
-#endif
         }
     }
 
@@ -488,7 +468,7 @@ spt_setup(void)
 #ifndef WIN32
     int argc = 0;
     char **argv = NULL;
-    char *init_title = "chia";
+    char *init_title;
 
     if (0 > get_argc_argv(&argc, &argv)) {
         spt_debug("get_argc_argv failed");
@@ -515,4 +495,3 @@ spt_setup(void)
 exit:
     return rv;
 }
-