Evas: Fix shadow declaration of variable 'write'.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@59713 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/cserve/evas_cs.h b/src/lib/cserve/evas_cs.h
index ffbefd3..6d1f3d6 100644 (file)
--- a/src/lib/cserve/evas_cs.h
+++ b/src/lib/cserve/evas_cs.h
@@ -272,7 +272,7 @@ EAPI Mem *evas_cserve_mem_new(int size, const char *name);
 EAPI void evas_cserve_mem_free(Mem *m);
     
 // for client
-EAPI Mem *evas_cserve_mem_open(int pid, int id, const char *name, int size, int write);
+EAPI Mem *evas_cserve_mem_open(int pid, int id, const char *name, int size, int do_write);
 EAPI void evas_cserve_mem_close(Mem *m);
 
 // for both

diff --git a/src/lib/cserve/evas_cs_mem.c b/src/lib/cserve/evas_cs_mem.c
index 1fff9ba..c1a9782 100644 (file)
--- a/src/lib/cserve/evas_cs_mem.c
+++ b/src/lib/cserve/evas_cs_mem.c
@@ -71,7 +71,7 @@ evas_cserve_mem_free(Mem *m)
 }
 
 EAPI Mem *
-evas_cserve_mem_open(int pid, int id, const char *name, int size, int write)
+evas_cserve_mem_open(int pid, int id, const char *name, int size, int do_write)
 {
    Mem *m;
    char buf[PATH_MAX];
@@ -89,7 +89,7 @@ evas_cserve_mem_open(int pid, int id, const char *name, int size, int write)
         return NULL;
      }
    m->size = size;
-   if (write)
+   if (do_write)
      m->fd = shm_open(m->name, O_RDWR, S_IRUSR | S_IWUSR);
    else
      m->fd = shm_open(m->name, O_RDONLY, S_IRUSR);
@@ -99,8 +99,8 @@ evas_cserve_mem_open(int pid, int id, const char *name, int size, int write)
         free(m);
         return NULL;
      }
-   m->write = write;
-   if (write)
+   m->write = do_write;
+   if (do_write)
      m->data = mmap(NULL, m->size, PROT_READ | PROT_WRITE, MAP_SHARED, m->fd, 0);
    else
      m->data = mmap(NULL, m->size, PROT_READ, MAP_SHARED, m->fd, 0);