Mercurial > octave-nkf
changeset 15747:4be890c5527c
* __java__.cc, __java__.h: Clean up lists of include files.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 07 Dec 2012 16:19:22 -0500 |
| parents | da26f72408a7 |
| children | 54e8c2527a9e |
| files | libinterp/dldfcn/__java__.cc libinterp/dldfcn/__java__.h |
| diffstat | 2 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/__java__.cc Fri Dec 07 16:14:49 2012 -0500 +++ b/libinterp/dldfcn/__java__.cc Fri Dec 07 16:19:22 2012 -0500 @@ -40,13 +40,14 @@ #include "Cell.h" #include "__java__.h" #include "cmd-edit.h" +#include "defun-dld.h" #include "file-ops.h" #include "file-stat.h" #include "load-path.h" #include "oct-env.h" -#include "oct-env.h" #include "oct-shlib.h" #include "parse.h" +#include "variables.h" typedef jint (JNICALL *JNI_CreateJavaVM_t) (JavaVM **pvm, JNIEnv **penv, void *args); typedef jint (JNICALL *JNI_GetCreatedJavaVMs_t) (JavaVM **pvm, jsize bufLen, jsize *nVMs);
--- a/libinterp/dldfcn/__java__.h Fri Dec 07 16:14:49 2012 -0500 +++ b/libinterp/dldfcn/__java__.h Fri Dec 07 16:19:22 2012 -0500 @@ -20,16 +20,14 @@ */ -#ifndef __JAVA__H__ -#define __JAVA__H__ +#if !defined (octave___java__h) +#define octave___java__h 1 -#include "oct.h" -#include "config.h" -#ifndef OCTAVE_EXPORT -#include "oct-dlldefs.h" -#endif // OCTAVE_EXPORT #include <jni.h> +#include <oct-obj.h> +#include <ov.h> + #ifdef JAVAPKG_BUILD # define JAVAPKG_API OCTAVE_EXPORT #else