summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-12-10 13:02:36 -0800
committercallum_linden <none@none>2014-12-10 13:02:36 -0800
commit6bb3fc93926e93154d9651e16e131ffa4c805a2e (patch)
tree68e413308788f6a7833d9c4ec34d106021511d15 /indra
parent3d94afafb530b9841c151a24799a08f064b70ede (diff)
Fix for incorrectly formatted #if statements (worked on clang FWIW!)
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llkdu/llimagej2ckdu.h2
-rwxr-xr-xindra/llkdu/llkdumem.h2
-rwxr-xr-xindra/llui/llrngwriter.cpp2
-rwxr-xr-xindra/llui/lluictrlfactory.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h
index 762476ce69..02281152bf 100755
--- a/indra/llkdu/llimagej2ckdu.h
+++ b/indra/llkdu/llimagej2ckdu.h
@@ -43,7 +43,7 @@
#pragma clang diagnostic ignored "-Wunused-private-field"
#include "kdu_compressed.h"
#pragma clang diagnostic pop
-#elif
+#else
#include "kdu_compressed.h"
#endif
diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h
index a0d304868e..fab913d93b 100755
--- a/indra/llkdu/llkdumem.h
+++ b/indra/llkdu/llkdumem.h
@@ -36,7 +36,7 @@
#pragma clang diagnostic ignored "-Wunused-private-field"
#include "kdu_image.h"
#pragma clang diagnostic pop
-#elif
+#else
#include "kdu_image.h"
#endif
diff --git a/indra/llui/llrngwriter.cpp b/indra/llui/llrngwriter.cpp
index 523bc7c667..e4a31d6a79 100755
--- a/indra/llui/llrngwriter.cpp
+++ b/indra/llui/llrngwriter.cpp
@@ -34,7 +34,7 @@
#pragma clang diagnostic ignored "-Wdelete-incomplete"
#include "lluictrlfactory.h"
#pragma clang diagnostic pop
-#elif
+#else
#include "lluictrlfactory.h"
#endif
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 17af45cc0c..3ce39c947f 100755
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -189,7 +189,7 @@ public:
#pragma clang diagnostic ignored "-Wdelete-incomplete"
delete view;
#pragma clang diagnostic pop
-#elif
+#else
delete view;
#endif
view = NULL;