From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 22 Jan 2013 22:59:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.0~149
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=e2962f03fe8fb0b1c47be56eca26761da97453a0;hp=-c

Merge remote-tracking branch 'origin/master'
---

e2962f03fe8fb0b1c47be56eca26761da97453a0
diff --combined gtest_sdl_main.cpp
index 21c923a,8a2fa9e..fa3a835
--- a/gtest_sdl_main.cpp
+++ b/gtest_sdl_main.cpp
@@@ -1,11 -1,12 +1,14 @@@
 +#define GTEST_HAS_EXCEPTIONS 0
 +
  #include <SDL/SDL.h>
  #include "gtest/gtest.h"
  
  int main(int argc, char **argv) {
  	// Set up an OpenGL context using SDL.
- 	SDL_Init(SDL_INIT_VIDEO);
+ 	if (SDL_Init(SDL_INIT_VIDEO) == -1) {
+ 		fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
+ 		exit(1);
+ 	}
  	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
  	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
  	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);