Changeset 37ff409


Ignore:
Timestamp:
Apr 22, 2013 8:38:52 PM (7 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
4358d11, 5fd63c12
Parents:
f5838ff (diff), 9550de67 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '97f6b32a68c76e9cbe8832d250144facb6aa729e'

and 'd9b5e2fc62256d9dc0d320fe593d56f0252b7f48'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • installer/c/i2pExe/i2p.c

    rf5838ff r37ff409  
    88#include "errors.h"
    99
    10 #ifdef _WIN32
    11 #include <windows.h>
    12 #endif
    13 
    14 #include <stdio.h>
     10#include <windows.h>
     11#include <stdio.h>   
    1512#include <malloc.h>
    1613#include <sys/stat.h>
    1714
    1815//BOOL MoveFontPropertiesFile(const char *path);
    19 #ifdef _WIN32
    2016void SetWorkingDirectory(char *path);
    21 #endif
    2217void readOptions(char***, int*);
    2318//BOOL localJREExists(const char*);
    24 //BOOL exist(const char*);
     19BOOL exist(const char*);
    2520
    2621// defined in java.c
     
    4035        char** new_argv;
    4136        int i;
    42 #ifdef _WIN32
    4337        char currentDirectory[MAX_PATH+1];
    44 #endif
    4538
    4639        // Set/get the correct working directory.
    47 #ifdef _WIN32
    4840        SetWorkingDirectory(currentDirectory);
    49 #endif
    5041
    5142        // If there are command-line arguments, just use them
     
    8475        case ERROR_COULDNT_INITIALIZE_JVM:
    8576        case ERROR_COULDNT_LOAD_JVM:
    86 #ifdef _WIN32
    8777                if (MessageBox(NULL, "I2P needs the Java Runtime Environment 5.0 or above. Click OK to go to www.java.com, where you can install Java.",
    8878                       "I2P Launcher Error",
    8979                       MB_ICONWARNING | MB_OKCANCEL) == IDOK)
    9080                        ShellExecute(NULL, NULL, "http://www.java.com/", "", "", SW_SHOWNORMAL);
    91 #endif
    9281                break;
    9382        case ERROR_COULDNT_PARSE_ARGUMENTS:
    94 #ifdef _WIN32
    9583                MessageBox(NULL, "I2P failed to parse the commandline arguments to Java.\n"
    9684                        "Please download and install I2P again.",
    9785                        "I2P Launcher Error", MB_OK);
    98 #endif
    9986                break;
    10087        case ERROR_STARTING_PROGRAM:
    101 #ifdef _WIN32
    10288                MessageBox(NULL, "I2P was unable to load.\n"
    10389                                "Please download and install I2P again.",
    10490                                "I2P Launcher Error", MB_OK);
    105 #endif
    10691                break;
    10792        }
     
    185170 * Sets the current working directory to wherever I2P.exe is located
    186171 */
    187 #ifdef _WIN32
    188172static void
    189173SetWorkingDirectory(char *path) {
     
    193177        GetCurrentDirectory(MAX_PATH + 1, path);
    194178}
    195 #endif
    196179
    197180/**
     
    227210}
    228211*/
    229 /*
     212
    230213BOOL exist(const char *filename) {
    231214        struct stat s;
    232215        return stat(filename, &s) == 0 ? TRUE : FALSE;
    233216}
    234 */
    235 
    236 #ifdef _WIN32
     217
     218
    237219__declspec(dllimport) char **__initenv;
    238220
     
    253235    return ret;
    254236}
    255 #endif
Note: See TracChangeset for help on using the changeset viewer.