← Back to branch summary

~ubuntu-branches/ubuntu/karmic/classpath/karmic

« back to all changes in this revision

Viewing changes to native/jni/gtk-peer/gtkpeer.c

  • Committer: Bazaar Package Importer
  • Author(s): Manny Vindiola, Manny Vindiola, James Westby
  • Date: 2008-12-18 21:24:48 UTC
  • mfrom: (1.1.6 upstream) (8.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20081218212448-ax2jaxx9r5175dkl
Tags: 2:0.97.2-1.1ubuntu1
https://launchpad.net/bugs/309549
https://launchpad.net/bugs/237668
https://launchpad.net/bugs/272772
[ Manny Vindiola ]
* Merge from debian unstable (LP: #309549)(LP: #237668), remaining changes:
  * debian/control:
    - Recommend firefox instead of mozilla-firefox.
  * Fix FTBFS caused by -Werror where return value of 'chdir' was ignored
    - add debian/patches/20_fix_ftbfs_warn_unused_result.dpatch
    - update debian/patches/00list
  * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
     (meta-package) must alternatively Depend/Recommend/Suggest abrowser
* Fix FTBFS due to missing mozilla-plugin build dependency 
  - changed to build-depends on libxul-dev instead of iceape-dev

[ James Westby ]
* Add libsamplerate0-dev to Build-Depends to fix build error by not being
  able to find the .a file from it. This is a dependency of jack, but not
  specified in it's depends. This is probably due to bug 258491, and so if
  that is fixed try building without the extra Build-Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
native/jni/gtk-peer/gtkpeer.c
102
102
#else
103
103
#if SIZEOF_VOID_P == 4
104
104
  pointerClass = (*env)->FindClass(env, "gnu/classpath/Pointer32");
105
 
  pointerDataFID = (*env)->GetFieldID(env, pointerClass, "data", "I");
106
 
 
107
 
  /* Find the Pointer32 constructor. */
108
 
  pointerConstructorMID = (*env)->GetMethodID(env, pointerClass, "<init>",
109
 
                                              "(I)V");
 
105
  if (pointerClass != NULL)
 
106
    {
 
107
      pointerClass = (*env)->NewGlobalRef (env, pointerClass);
 
108
      pointerDataFID = (*env)->GetFieldID (env, pointerClass, "data", "I");
 
109
      pointerConstructorMID = (*env)->GetMethodID (env, pointerClass, "<init>",
 
110
                                                   "(I)V");
 
111
    }
110
112
#else
111
113
#error "Pointer size is not supported."
112
114
#endif /* SIZEOF_VOID_P == 4 */