diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-04 14:02:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-06-04 17:45:42 +0100 |
| commit | c32c11fbd49e0194534be9d21c22da6799728be3 (patch) | |
| tree | 2ce05f2cd61416625dc31d7d9ff7fb278b8c4fb1 /sccomp | |
| parent | ea9b4a69469cbd8bdbbd972638612632adf31d66 (diff) | |
MPLv2 subset improvements.
Diffstat (limited to 'sccomp')
| -rw-r--r-- | sccomp/Module_sccomp.mk | 2 | ||||
| -rw-r--r-- | sccomp/source/solver/solver.cxx | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk index 44d26f3cb1f4..15d9a6c6eeea 100644 --- a/sccomp/Module_sccomp.mk +++ b/sccomp/Module_sccomp.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Module_Module,sccomp)) -ifneq ($(OS),IOS) +ifeq ($(ENABLE_LPSOLVE),TRUE) $(eval $(call gb_Module_add_targets,sccomp,\ AllLangResTarget_solver \ diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index c5b1c272cfae..1a38e8b7a1df 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -24,9 +24,20 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + * ************************************************************************/ #include "sal/config.h" +#include <config_lgpl.h> #undef LANGUAGE_NONE #if defined SAL_W32 |