Changeset 304

Show
Ignore:
Timestamp:
Sun Jan 28 08:56:59 2007
Author:
giovannibajo
Message:

Ticket #4: remove C++-ism from the bootloader for the AIX compiler.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/source/linux/main.c

    r43 r304  
    50 50     PyImport_FrozenModules = _PyImport_FrozenModules;  
    51 51 #endif  
    52       // fill in thisfile  
      52     /* fill in thisfile */  
    52 52 #ifdef __CYGWIN__  
    53 53     if (strncasecmp(&argv[0][strlen(argv[0])-4], ".exe", 4)) {  
    …… 
    68 68     VS(" is _MEIPASS2 (workpath)\n");  
    69 69  
    70       // fill in here (directory of thisfile)  
      70     /* fill in here (directory of thisfile) */  
    70 70     strcpy(homepath, Py_GetPrefix());  
    71 71     strcat(homepath, "/");  
    …… 
    89 89  
    90 90     if (workpath) {  
    91           // we're the "child" process  
      91         /* we're the "child" process */  
    91 91         VS("Already have a workpath - running!\n");  
    92 92         rc = doIt(argc, argv);  
    …… 
    111 111         if (workpath) {  
    112 112             VS("Executing self as child with ");  
    113               // run the "child" process, then clean up  
      113             /* run the "child" process, then clean up */  
    113 113             strcpy(magic_envvar, "_MEIPASS2=");  
    114 114             strcat(magic_envvar, workpath);  
    115 115             putenv(magic_envvar);  
    116               // now LD_LIBRARY_PATH  
      116             /* now LD_LIBRARY_PATH */  
    116 116             strcpy(ldlib_envvar, "LD_LIBRARY_PATH=");  
    117 117             strcat(ldlib_envvar, workpath);  
    …… 
    131 131         }  
    132 132         else  
    133               // no "child" process necessary  
      133             /* no "child" process necessary */  
    133 133             rc = doIt(argc, argv);  
    134 134     }  

  • trunk/source/common/launch.c

    r288 r304  
    640 640         char *cmd = (char *) malloc(strlen(tmpl) + strlen(f_archivename) + 32);  
    641 641         sprintf(cmd, tmpl, f_archivename, zlibpos);  
    642           //VS(cmd);  
      642         /*VS(cmd);*/  
    642 642         rc = PyRun_SimpleString(cmd);  
    643 643         if (rc != 0)  
    …… 
    736 736  
    737 737         sprintf( msg, " extracting %1.20s (%d, %c)\n", ptoc->name, ptoc->cflag, ptoc->typcd);  
    738           //VS(msg);  
      738         /*VS(msg);*/  
    738 738         fseek(f_fp, f_pkgstart + ntohl(ptoc->pos), SEEK_SET);  
    739 739         data = (unsigned char *)malloc(ntohl(ptoc->len));  
    …… 
    903 903         rc = PyErr_Occurred() ? -1 : 0;  
    904 904         VS( rc ? "Finished with failure\n" : "Finished OK\n");  
    905           // all done!  
      905         /* all done! */  
    905 905 done:  
    906 906         Py_XDECREF(func);  
    …… 
    961 961         VS("All scripts run\n");  
    962 962         if (PyErr_Occurred()) {  
    963                   // PyErr_Print();  
    964                   //PyErr_Clear();  
      963                 /*PyErr_Clear();*/  
    965 964                 VS("Some error occurred\n");  
    966 965         }