aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindowsdl.cpp
diff options
context:
space:
mode:
authorAleric Inglewood2010-09-30 02:17:43 +0200
committerAleric Inglewood2010-09-30 02:17:43 +0200
commit5585f21a28019067af2800837d72bab23908f882 (patch)
tree9c06e1cc63aef19faea1292927f43a93e547c93b /linden/indra/llwindow/llwindowsdl.cpp
parentUpdate of doc/contributions.txt (diff)
downloadmeta-impy-5585f21a28019067af2800837d72bab23908f882.zip
meta-impy-5585f21a28019067af2800837d72bab23908f882.tar.gz
meta-impy-5585f21a28019067af2800837d72bab23908f882.tar.bz2
meta-impy-5585f21a28019067af2800837d72bab23908f882.tar.xz
SNOW-86: Dangerous macro leads to possible wrong code
See http://redmine.imprudenceviewer.org/issues/571 This patch appeared to already have been partially applied. I added more semi-colons after all llendl (and LLENDL) macros, and wrapped the lllog ... llendl construct into do { ... } while(0) as is usual for macros that mimic a single statement. The patch was double checked with regular expression greps and a compile.
Diffstat (limited to '')
-rw-r--r--linden/indra/llwindow/llwindowsdl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index bf339f2..16a583a 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -671,12 +671,12 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
671 glGetIntegerv(GL_DEPTH_BITS, &depthBits); 671 glGetIntegerv(GL_DEPTH_BITS, &depthBits);
672 glGetIntegerv(GL_STENCIL_BITS, &stencilBits); 672 glGetIntegerv(GL_STENCIL_BITS, &stencilBits);
673 673
674 llinfos << "GL buffer:" << llendl 674 llinfos << "GL buffer:" << llendl;
675 llinfos << " Red Bits " << S32(redBits) << llendl 675 llinfos << " Red Bits " << S32(redBits) << llendl;
676 llinfos << " Green Bits " << S32(greenBits) << llendl 676 llinfos << " Green Bits " << S32(greenBits) << llendl;
677 llinfos << " Blue Bits " << S32(blueBits) << llendl 677 llinfos << " Blue Bits " << S32(blueBits) << llendl;
678 llinfos << " Alpha Bits " << S32(alphaBits) << llendl 678 llinfos << " Alpha Bits " << S32(alphaBits) << llendl;
679 llinfos << " Depth Bits " << S32(depthBits) << llendl 679 llinfos << " Depth Bits " << S32(depthBits) << llendl;
680 llinfos << " Stencil Bits " << S32(stencilBits) << llendl; 680 llinfos << " Stencil Bits " << S32(stencilBits) << llendl;
681 681
682 GLint colorBits = redBits + greenBits + blueBits + alphaBits; 682 GLint colorBits = redBits + greenBits + blueBits + alphaBits;