From 2108c7088c29294f46e8acc6d5f2c40568a685f8 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Wed, 30 Aug 2000 12:29:39 +0000 Subject: [PATCH] Copy cls's hack to another makefile to fix nebiros bustage. This prevents time.h from being included on Sun's WorkShop compiler. r=scc --- embedding/browser/gtk/tests/Makefile.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/embedding/browser/gtk/tests/Makefile.in b/embedding/browser/gtk/tests/Makefile.in index 85e226281a3e..a11a1e03c53c 100644 --- a/embedding/browser/gtk/tests/Makefile.in +++ b/embedding/browser/gtk/tests/Makefile.in @@ -67,3 +67,14 @@ else CXXFLAGS += $(MOZ_GTK_CFLAGS) endif + +ifeq ($(OS_ARCH), SunOS) +ifndef GNU_CC +# When using Sun's WorkShop compiler, including +# /wherever/workshop-5.0/SC5.0/include/CC/std/time.h +# causes most of these compiles to fail with: +# line 29: Error: Multiple declaration for std::tm. +# So, this gets around the problem. +DEFINES += -D_TIME_H=1 +endif +endif