From 9f56fe66a2f8fb431bde5d0a34a3ac94f4c9dd34 Mon Sep 17 00:00:00 2001 From: Munkyu Im Date: Tue, 28 Oct 2014 18:29:26 +0900 Subject: [PATCH] osutil: Change os dependent variable Not use "#define... #endif" but use extern variable. Change-Id: I4e63ef019bfc42af4d0aaf440257c77bb39a37fe Signed-off-by: Munkyu Im --- tizen/src/util/osutil-win32.c | 1 - tizen/src/util/osutil.c | 4 +--- tizen/src/util/osutil.h | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tizen/src/util/osutil-win32.c b/tizen/src/util/osutil-win32.c index bd07447..9efef47 100644 --- a/tizen/src/util/osutil-win32.c +++ b/tizen/src/util/osutil-win32.c @@ -56,7 +56,6 @@ static char *g_pBuf; extern char tizen_target_img_path[]; static char g_sdcard[256] = {0,}; -static sdcard_info info; static const char *pactempfile = ".autoproxy"; diff --git a/tizen/src/util/osutil.c b/tizen/src/util/osutil.c index a3b4855..9e6f9ba 100644 --- a/tizen/src/util/osutil.c +++ b/tizen/src/util/osutil.c @@ -43,9 +43,7 @@ MULTI_DEBUG_CHANNEL(emulator, osutil); -#ifndef CONFIG_WIN32 -static sdcard_info info; -#endif +sdcard_info info; const char *pac_tempfile = ".autoproxy"; inline size_t write_data(void *ptr, size_t size, size_t nmemb, FILE *stream) diff --git a/tizen/src/util/osutil.h b/tizen/src/util/osutil.h index 2997a78..c858726 100644 --- a/tizen/src/util/osutil.h +++ b/tizen/src/util/osutil.h @@ -80,8 +80,8 @@ typedef struct sdcard_info HANDLE handle; #endif char* lock_file; /* reserved for future use */ -}sdcard_info; - +} sdcard_info; +extern sdcard_info info; #ifndef CONFIG_WIN32 bool make_sdcard_lock_posix(char *sdcard); -- 2.7.4