[arrayfire] 167/248: Fixes for ushort on windows

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit 75f228b822934a678c5be1090481b3938d8e3c7f
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Fri Oct 30 14:38:27 2015 -0400

    Fixes for ushort on windows
---
 src/api/c/graphics_common.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/c/graphics_common.cpp b/src/api/c/graphics_common.cpp
index fe68acb..4b50bc0 100644
--- a/src/api/c/graphics_common.cpp
+++ b/src/api/c/graphics_common.cpp
@@ -27,7 +27,7 @@ INSTANTIATE_GET_FG_TYPE(int  , fg::s32);
 INSTANTIATE_GET_FG_TYPE(unsigned, fg::u32);
 INSTANTIATE_GET_FG_TYPE(char, fg::s8);
 INSTANTIATE_GET_FG_TYPE(unsigned char, fg::u8);
-INSTANTIATE_GET_FG_TYPE(ushort, fg::u16);
+INSTANTIATE_GET_FG_TYPE(unsigned short, fg::u16);
 INSTANTIATE_GET_FG_TYPE(short, fg::s16);
 
 GLenum glErrorSkip(const char *msg, const char* file, int line)
@@ -81,7 +81,7 @@ size_t getTypeSize(GLenum type)
         case GL_INT:            return sizeof(int  );
         case GL_UNSIGNED_INT:   return sizeof(unsigned);
         case GL_SHORT:          return sizeof(short);
-        case GL_UNSIGNED_SHORT: return sizeof(ushort);
+        case GL_UNSIGNED_SHORT: return sizeof(unsigned short);
         case GL_BYTE:           return sizeof(char );
         case GL_UNSIGNED_BYTE:  return sizeof(unsigned char);
         default: return sizeof(float);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git