Replacing macros with inline functions.

Change-Id: Ibde8fb45594cd259fc3281d7874de8fc877fd4f2
1 file changed