diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2013-10-11 21:48:45 +0100 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-10-11 21:48:45 +0100 |
commit | 7b08378145ad703cb6a8cc128c01975dfdce8af4 (patch) | |
tree | b1b1954f470f0132b7ae59654c0ff85648a43119 | |
parent | 053856893c113569f227efa78ec00559152a907f (diff) | |
download | swig-7b08378145ad703cb6a8cc128c01975dfdce8af4.tar.gz |
Minor cleanup prior to merging to master
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | Examples/Makefile.in | 2 | ||||
-rw-r--r-- | Lib/php/director.swg | 3 | ||||
-rw-r--r-- | Source/Swig/warn.c | 38 |
4 files changed, 1 insertions, 43 deletions
diff --git a/.travis.yml b/.travis.yml index eca1838d2..26758304f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,4 +56,3 @@ script: branches: only: - master - - gsoc2009-matevz diff --git a/Examples/Makefile.in b/Examples/Makefile.in index b6712378b..b986774b6 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -1520,7 +1520,7 @@ endif r_cpp: $(CXXSRCS) $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACEPATH) ifneq ($(CXXSRCS),) - $(CXX) -g -c $(CFLAGS) $(R_CFLAGS) $(CXXSRCS) $(INCLUDES) + $(CXX) -g -c $(CXXFLAGS) $(R_CFLAGS) $(CXXSRCS) $(INCLUDES) endif +( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) $(OBJS) > /dev/null ) diff --git a/Lib/php/director.swg b/Lib/php/director.swg index a78a2370f..90f6a74a2 100644 --- a/Lib/php/director.swg +++ b/Lib/php/director.swg @@ -1,7 +1,4 @@ /* ----------------------------------------------------------------------------- - * See the LICENSE file for information on copyright, usage and redistribution - * of SWIG, and the README file for authors - http://www.swig.org/release.html. - * * director.swg * * This file contains support for director classes that proxy diff --git a/Source/Swig/warn.c b/Source/Swig/warn.c deleted file mode 100644 index dfb2e4af4..000000000 --- a/Source/Swig/warn.c +++ /dev/null @@ -1,38 +0,0 @@ -/* ----------------------------------------------------------------------------- - * This file is part of SWIG, which is licensed as a whole under version 3 - * (or any later version) of the GNU General Public License. Some additional - * terms also apply to certain portions of SWIG. The full details of the SWIG - * license and copyrights can be found in the LICENSE and COPYRIGHT files - * included with the SWIG source code as distributed by the SWIG developers - * and at http://www.swig.org/legal.html. - * - * warn.c - * - * SWIG warning framework. This was added to warn developers about - * deprecated APIs and other features. - * ----------------------------------------------------------------------------- */ - -char cvsroot_warn_c[] = "$Id$"; - -#include "swig.h" - -static Hash *warnings = 0; - -/* ----------------------------------------------------------------------------- - * Swig_warn() - * - * Issue a warning - * ----------------------------------------------------------------------------- */ - -void Swig_warn(const char *filename, int line, const char *msg) { - String *key; - if (!warnings) { - warnings = NewHash(); - } - key = NewStringf("%s:%d", filename, line); - if (!Getattr(warnings, key)) { - Printf(stderr, "swig-dev warning:%s:%d:%s\n", filename, line, msg); - Setattr(warnings, key, key); - } - Delete(key); -} |