diff options
author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-03-29 17:23:51 -0400 |
---|---|---|
committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-03-29 17:23:51 -0400 |
commit | c742be31d3e1604d8d4956fde8d816377bf5b0d0 (patch) | |
tree | f8007e1774c53cdff7359a0c1b58e96e20fff409 /bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library | |
parent | 58df76a2e50f26900ab1ed223960bfd79d3eba45 (diff) | |
download | eclipse.platform.swt-c742be31d3e1604d8d4956fde8d816377bf5b0d0.tar.gz eclipse.platform.swt-c742be31d3e1604d8d4956fde8d816377bf5b0d0.tar.xz eclipse.platform.swt-c742be31d3e1604d8d4956fde8d816377bf5b0d0.zip |
need to be able to overwrite native package name (actual code)
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library')
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c index 6bfd7e24cb..8b3b70a81e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa.c @@ -13,7 +13,9 @@ #include "cocoa_structs.h" #include "cocoa_stats.h" +#ifndef Cocoa_NATIVE #define Cocoa_NATIVE(func) Java_org_eclipse_swt_internal_cocoa_Cocoa_##func +#endif #ifndef NO_HICocoaViewCreate JNIEXPORT jint JNICALL Cocoa_NATIVE(HICocoaViewCreate) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c index c824f03483..2feb719e12 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2012 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -13,7 +13,9 @@ #include "os_structs.h" #include "os_stats.h" +#ifndef OS_NATIVE #define OS_NATIVE(func) Java_org_eclipse_swt_internal_carbon_OS_##func +#endif #ifndef NO_AECoerceDesc JNIEXPORT jint JNICALL OS_NATIVE(AECoerceDesc) |