From a6c549b12693f55c8355d8fe23bef712171d5691 Mon Sep 17 00:00:00 2001
From: clarkchenwang <clarkchenwang@google.com>
Date: Thu, 1 Sep 2016 11:06:41 -0700
Subject: [PATCH] change gitignore file and change the name of NUM_MACRO to
 NUM_OPTIONS

---
 .gitignore                     | 25 +------------------------
 common/MoreTeapotsRenderer.cpp |  6 +++---
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5cad1d0..de3296c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,10 @@
 # Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.exe
 *.o
 *.so
-
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
 *.jar
-*.rar
-*.tar
-*.zip
-
-# Logs and databases #
-######################
 *.log
-*.sql
-*.sqlite
 
 # OS generated files #
-######################
 .DS_Store
 .DS_Store?
 ._*
@@ -43,7 +20,7 @@ Thumbs.db
 # Java class #
 *.class
 
-# Generated files
+# Building Generated files #
 android/build/
 android/app/build/
 android/nativeactivity/build
diff --git a/common/MoreTeapotsRenderer.cpp b/common/MoreTeapotsRenderer.cpp
index 375f16d..122bcd2 100644
--- a/common/MoreTeapotsRenderer.cpp
+++ b/common/MoreTeapotsRenderer.cpp
@@ -30,11 +30,11 @@
 //--------------------------------------------------------------------------------
 // Check macros
 //--------------------------------------------------------------------------------
-#define NUM_MACRO defined(TEAPOT) + defined(TRIANGLE) + defined(ZERO)
+#define NUM_OPTIONS defined(TEAPOT) + defined(TRIANGLE) + defined(ZERO)
 
-#if NUM_MACRO < 1
+#if NUM_OPTIONS < 1
 #error you must define one macro from TEAPOT, TRIANGLE or ZERO
-#elif NUM_MACRO > 1
+#elif NUM_OPTIONS > 1
 #error you cannot define more than one macro from TEAPOT, TRIANGLE or ZERO
 #endif