From: Roland McGrath <roland@hack.frob.com>
Date: Mon, 29 Apr 2013 20:42:04 +0000 (-0700)
Subject: struct nacl_irt_memory rename
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e34d952580779a0fa39f5d833791e4afba0c0992;p=thirdparty%2Fglibc.git

struct nacl_irt_memory rename
---

diff --git a/sysdeps/nacl/brk.c b/sysdeps/nacl/brk.c
index 8bb716d4300..93dda43f1a2 100644
--- a/sysdeps/nacl/brk.c
+++ b/sysdeps/nacl/brk.c
@@ -28,7 +28,7 @@ void *__curbrk;
 int
 __brk (void *addr)
 {
-  int error = __nacl_irt_memory_v0_2.sysbrk (&addr);
+  int error = __nacl_irt_memory.sysbrk (&addr);
   if (__glibc_unlikely (error))
     {
       __set_errno (error);
diff --git a/sysdeps/nacl/mmap.c b/sysdeps/nacl/mmap.c
index 270cdfb4a8b..9faa2d31fa1 100644
--- a/sysdeps/nacl/mmap.c
+++ b/sysdeps/nacl/mmap.c
@@ -33,7 +33,7 @@
 __ptr_t
 __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
-  int error = __nacl_irt_memory_v0_2.mmap (&addr, len, prot, flags, fd, offset);
+  int error = __nacl_irt_memory.mmap (&addr, len, prot, flags, fd, offset);
   if (error)
     {
       errno = error;
diff --git a/sysdeps/nacl/mprotect.c b/sysdeps/nacl/mprotect.c
index 648c102017f..b23dfa8bdc7 100644
--- a/sysdeps/nacl/mprotect.c
+++ b/sysdeps/nacl/mprotect.c
@@ -28,6 +28,6 @@
 int
 __mprotect (__ptr_t addr, size_t len, int prot)
 {
-  return NACL_CALL (__nacl_irt_memory_v0_2.mprotect (addr, len, prot), 0);
+  return NACL_CALL (__nacl_irt_memory.mprotect (addr, len, prot), 0);
 }
 weak_alias (__mprotect, mprotect)
diff --git a/sysdeps/nacl/munmap.c b/sysdeps/nacl/munmap.c
index d079ad33b11..753be5d6696 100644
--- a/sysdeps/nacl/munmap.c
+++ b/sysdeps/nacl/munmap.c
@@ -26,7 +26,7 @@
 int
 __munmap (__ptr_t addr, size_t len)
 {
-  return NACL_CALL (__nacl_irt_memory_v0_2.munmap (addr, len), 0);
+  return NACL_CALL (__nacl_irt_memory.munmap (addr, len), 0);
 }
 
 weak_alias (__munmap, munmap)
diff --git a/sysdeps/nacl/nacl-interface-list.h b/sysdeps/nacl/nacl-interface-list.h
index 2f46b73bc6a..880770c7a56 100644
--- a/sysdeps/nacl/nacl-interface-list.h
+++ b/sysdeps/nacl/nacl-interface-list.h
@@ -1,7 +1,7 @@
 NACL_MANDATORY_INTERFACE (NACL_IRT_BASIC_v0_1, nacl_irt_basic)
 NACL_MANDATORY_INTERFACE (NACL_IRT_FDIO_v0_1, nacl_irt_fdio)
 NACL_MANDATORY_INTERFACE (NACL_IRT_FILENAME_v0_1, nacl_irt_filename)
-NACL_MANDATORY_INTERFACE (NACL_IRT_MEMORY_v0_2, nacl_irt_memory_v0_2)
+NACL_MANDATORY_INTERFACE (NACL_IRT_MEMORY_v0_2, nacl_irt_memory)
 NACL_MANDATORY_INTERFACE (NACL_IRT_DYNCODE_v0_1, nacl_irt_dyncode)
 NACL_MANDATORY_INTERFACE (NACL_IRT_THREAD_v0_1, nacl_irt_thread)
 NACL_MANDATORY_INTERFACE (NACL_IRT_MUTEX_v0_1, nacl_irt_mutex)