Skip to content

Commit

Permalink
renamed ARCHs just in case
Browse files Browse the repository at this point in the history
  • Loading branch information
teras committed Sep 3, 2017
1 parent 46672f1 commit 1b9f560
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions appimagetool.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,12 +249,12 @@ static void replacestr(char *line, const char *search, const char *replace)
}
}

typedef struct ARCHs {
typedef struct REQ_ARCHs {
char i386;
char x86_64;
} ARCH;
} REQ_ARCH;

void guess_arch(const gchar *archfile, ARCH* arch) {
void guess_arch(const gchar *archfile, REQ_ARCH* arch) {
gchar *found_arch;
char line[PATH_MAX];
char command[PATH_MAX];
Expand All @@ -278,7 +278,7 @@ void guess_arch(const gchar *archfile, ARCH* arch) {
}
}

void find_arch(const gchar *real_path, const gchar *pattern, ARCH* arch) {
void find_arch(const gchar *real_path, const gchar *pattern, REQ_ARCH* arch) {
GDir *dir;
gchar *full_name;
dir = g_dir_open(real_path, 0, NULL);
Expand Down Expand Up @@ -476,7 +476,7 @@ main (int argc, char *argv[])
/* If no $ARCH variable is set check a file */
if (!arch) {
/* We use the next best .so that we can find to determine the architecture */
ARCH guessed_arch = {};
REQ_ARCH guessed_arch = {};
find_arch(source, "*.so.*", &guessed_arch);
int countArchs = 0;
if (guessed_arch.i386) {
Expand Down

0 comments on commit 1b9f560

Please sign in to comment.