Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Proposal] Add code improvements for SUN OS compilation #1326

Closed
wants to merge 1 commit into from
Closed

[Proposal] Add code improvements for SUN OS compilation #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ AC_CONFIG_AUX_DIR([script])
# Though they look like gcc flags!
AM_INIT_AUTOMAKE([foreign parallel-tests -Wall])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
# would fail with mingw otherwise
m4_pattern_allow([AM_PROG_AR])

# Checks for programs.
AC_PROG_CXX
AC_LANG([C++])
AM_PROG_AR([])
LT_INIT([dlopen])

# Checks for header files.
Expand Down
8 changes: 6 additions & 2 deletions units.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
#include <string>
#include <sstream>

#ifdef __sun
#undef SEC
#endif

namespace Sass {
using namespace std;

Expand Down Expand Up @@ -59,9 +63,9 @@ namespace Sass {
extern const double frequency_conversion_factors[2][2];
extern const double resolution_conversion_factors[3][3];

SassUnit string_to_unit(const string&);
enum SassUnit string_to_unit(const string&);
const char* unit_to_string(SassUnit unit);
SassUnitType get_unit_type(SassUnit unit);
enum SassUnitType get_unit_type(SassUnit unit);
// throws incompatibleUnits exceptions
double conversion_factor(const string&, const string&);

Expand Down