diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
| commit | d4031485203356aba449d7aabfa4dc5fe8c28495 (patch) | |
| tree | f18fc88157a950affca45fbe8757a7892faab710 /soltools/mkdepend | |
| parent | a5dd1eade9ab57a5a5cd3795a08cc7f484343174 (diff) | |
| parent | 9c17c7ed4f09499be3f6bfcbf2f5aa246d998634 (diff) | |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'soltools/mkdepend')
| -rwxr-xr-x | soltools/mkdepend/collectdircontent.cxx | 4 | ||||
| -rw-r--r-- | soltools/mkdepend/collectdircontent.hxx | 1 | ||||
| -rw-r--r-- | soltools/mkdepend/main.c | 3 | ||||
| -rwxr-xr-x | soltools/mkdepend/makefile.mk | 8 |
4 files changed, 10 insertions, 6 deletions
diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index 691996d56cca..c9308faf0562 100755 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -73,6 +73,10 @@ extern "C" { return new IncludesCollection; } + void delete_IncludesCollection(IncludesCollection *m) { + delete m; + } + int call_IncludesCollection_exists(IncludesCollection* m, const char * filePath) { return m->exists(filePath); } diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx index 1ffd9cf60f0c..1896df0c8bc7 100644 --- a/soltools/mkdepend/collectdircontent.hxx +++ b/soltools/mkdepend/collectdircontent.hxx @@ -47,6 +47,7 @@ extern "C" { #endif struct IncludesCollection * create_IncludesCollection(void); +void delete_IncludesCollection(struct IncludesCollection *); int call_IncludesCollection_exists(struct IncludesCollection* m, const char* filePath); diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index a786f5a4d7f6..fd9bdc18e5d2 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -465,6 +465,9 @@ int main(argc, argv) } if (printed) printf("\n"); + + delete_IncludesCollection(incCollection); + exit(0); } diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index af4bae825601..630c688faba2 100755 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk @@ -1,15 +1,11 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.20 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |