summaryrefslogtreecommitdiff
path: root/src/video
diff options
context:
space:
mode:
authorskidd13 <skidd13@openttd.org>2007-11-19 20:40:14 +0000
committerskidd13 <skidd13@openttd.org>2007-11-19 20:40:14 +0000
commit7a4d96f629a9bd447846f8569fad78cf8e5196c5 (patch)
tree6112141c4dddc87df3ac0db557f34623319c73e0 /src/video
parent26224adf782da38e00ea97ff82e5420559464199 (diff)
downloadopenttd-7a4d96f629a9bd447846f8569fad78cf8e5196c5.tar.xz
(svn r11480) -Codechange: Rename the function ALIGN fitting to the naming style
This fixes also FS#1450
Diffstat (limited to 'src/video')
-rw-r--r--src/video/cocoa_v.mm2
-rw-r--r--src/video/win32_v.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/video/cocoa_v.mm b/src/video/cocoa_v.mm
index fd8a7cb90..cf76ccd94 100644
--- a/src/video/cocoa_v.mm
+++ b/src/video/cocoa_v.mm
@@ -52,8 +52,6 @@ extern "C" void HideMenuBar();
#endif
-/* Defined in ppc/param.h or i386/param.h included from sys/param.h */
-#undef ALIGN
/* Defined in stdbool.h */
#ifndef __cplusplus
# ifndef __BEOS__
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index 03728090c..16677fb87 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -686,7 +686,7 @@ static bool AllocateDibSection(int w, int h)
return false;
_screen.width = w;
- _screen.pitch = (bpp == 8) ? ALIGN(w, 4) : w;
+ _screen.pitch = (bpp == 8) ? Align(w, 4) : w;
_screen.height = h;
bi = (BITMAPINFO*)alloca(sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256);
memset(bi, 0, sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256);