Skip to content
This repository was archived by the owner on Oct 24, 2025. It is now read-only.

Commit cb34953

Browse files
committed
Add code improvements for SUN OS compilation
https://gist.github.com/jperkin/4b88403da41f556e540d
1 parent dfbbca0 commit cb34953

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,13 @@ AC_CONFIG_AUX_DIR([script])
1313
# Though they look like gcc flags!
1414
AM_INIT_AUTOMAKE([foreign parallel-tests -Wall])
1515
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
16+
# would fail with mingw otherwise
17+
m4_pattern_allow([AM_PROG_AR])
1618

1719
# Checks for programs.
1820
AC_PROG_CXX
1921
AC_LANG([C++])
22+
AM_PROG_AR([])
2023
LT_INIT([dlopen])
2124

2225
# Checks for header files.

units.hpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
#include <string>
66
#include <sstream>
77

8+
#ifdef __sun
9+
#undef SEC
10+
#endif
11+
812
namespace Sass {
913
using namespace std;
1014

@@ -59,9 +63,9 @@ namespace Sass {
5963
extern const double frequency_conversion_factors[2][2];
6064
extern const double resolution_conversion_factors[3][3];
6165

62-
SassUnit string_to_unit(const string&);
66+
enum SassUnit string_to_unit(const string&);
6367
const char* unit_to_string(SassUnit unit);
64-
SassUnitType get_unit_type(SassUnit unit);
68+
enum SassUnitType get_unit_type(SassUnit unit);
6569
// throws incompatibleUnits exceptions
6670
double conversion_factor(const string&, const string&);
6771

0 commit comments

Comments
 (0)