summaryrefslogtreecommitdiff
path: root/np_sdk/mozsrc/jritypes.h
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:16:09 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:16:09 +0200
commit3ad9a2b5f396aad97e4af3d6979c832fd32459bb (patch)
tree164de61066fa40f364510b725b26a10748d9fba9 /np_sdk/mozsrc/jritypes.h
parent84a77492a26976c84c15d0c6ba558d30b87f0b51 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 50c9598ba64212a30b93ff818b01e6edb2d79ece (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:44 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 48d68cb55dece21703b2fd24822905ebf024a7c8 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:27 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 42a8568ffba726cd03054933b6af60288cab8bdd Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Sun Jan 23 22:49:57 2011 +0100 upgrade libwpd to 0.9.1 libwpd/libwpd-0.8.8.diff | 908 ---------------------------------------------- libwpd/makefile.mk | 4 +- 2 files changed, 2 insertions(+), 910 deletions(-) commit 89d2254ecf768981e1dd5562b895aee756125478 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:57 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 156a4b779e5510f4aacdfec906f171175a23b492 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:08 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: libs-extern_libreoffice-3.3.1.1 split repo tag: libs-extern_libreoffice-3.3.1.2
Diffstat (limited to 'np_sdk/mozsrc/jritypes.h')
-rw-r--r--np_sdk/mozsrc/jritypes.h122
1 files changed, 61 insertions, 61 deletions
diff --git a/np_sdk/mozsrc/jritypes.h b/np_sdk/mozsrc/jritypes.h
index 03a7a9dcfe41..8735f1078c3f 100644
--- a/np_sdk/mozsrc/jritypes.h
+++ b/np_sdk/mozsrc/jritypes.h
@@ -14,7 +14,7 @@
*
* The Original Code is mozilla.org code.
*
- * The Initial Developer of the Original Code is
+ * The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
@@ -57,42 +57,42 @@ extern "C" {
struct JRIEnvInterface;
-typedef void* JRIRef;
-typedef void* JRIGlobalRef;
+typedef void* JRIRef;
+typedef void* JRIGlobalRef;
-typedef jint JRIFieldID;
-typedef jint JRIMethodID;
+typedef jint JRIFieldID;
+typedef jint JRIMethodID;
/* synonyms: */
-typedef JRIGlobalRef jglobal;
+typedef JRIGlobalRef jglobal;
typedef union JRIValue {
- jbool z;
- jbyte b;
- jchar c;
- jshort s;
- jint i;
- jlong l;
- jfloat f;
- jdouble d;
- jref r;
+ jbool z;
+ jbyte b;
+ jchar c;
+ jshort s;
+ jint i;
+ jlong l;
+ jfloat f;
+ jdouble d;
+ jref r;
} JRIValue;
typedef enum JRIBoolean {
- JRIFalse = 0,
- JRITrue = 1
+ JRIFalse = 0,
+ JRITrue = 1
} JRIBoolean;
typedef enum JRIConstant {
- JRIUninitialized = -1
+ JRIUninitialized = -1
} JRIConstant;
/* convenience types (these must be distinct struct types for c++ overloading): */
-typedef struct jstringArrayStruct* jstringArray;
-typedef struct jarrayArrayStruct* jarrayArray;
+typedef struct jstringArrayStruct* jstringArray;
+typedef struct jarrayArrayStruct* jarrayArray;
-#define JRIConstructorMethodName "<init>"
+#define JRIConstructorMethodName "<init>"
/*******************************************************************************
* Signature Construction Macros
@@ -103,29 +103,29 @@ typedef struct jarrayArrayStruct* jarrayArray;
** are a little easier to remember than the single character they correspond to.
** For example, to specify the signature of the method:
**
-** public int read(byte b[], int off, int len);
+** public int read(byte b[], int off, int len);
**
** you could write something like this in C:
**
-** char* readSig = JRISigMethod(JRISigArray(JRISigByte)
-** JRISigInt
-** JRISigInt) JRISigInt;
+** char* readSig = JRISigMethod(JRISigArray(JRISigByte)
+** JRISigInt
+** JRISigInt) JRISigInt;
**
** Of course, don't put commas between the types.
*/
-#define JRISigArray(T) "[" T
-#define JRISigByte "B"
-#define JRISigChar "C"
-#define JRISigClass(name) "L" name ";"
-#define JRISigFloat "F"
-#define JRISigDouble "D"
-#define JRISigMethod(args) "(" args ")"
-#define JRISigNoArgs ""
-#define JRISigInt "I"
-#define JRISigLong "J"
-#define JRISigShort "S"
-#define JRISigVoid "V"
-#define JRISigBoolean "Z"
+#define JRISigArray(T) "[" T
+#define JRISigByte "B"
+#define JRISigChar "C"
+#define JRISigClass(name) "L" name ";"
+#define JRISigFloat "F"
+#define JRISigDouble "D"
+#define JRISigMethod(args) "(" args ")"
+#define JRISigNoArgs ""
+#define JRISigInt "I"
+#define JRISigLong "J"
+#define JRISigShort "S"
+#define JRISigVoid "V"
+#define JRISigBoolean "Z"
/*******************************************************************************
* Environments
@@ -146,53 +146,53 @@ JRI_GetCurrentEnv(void);
** passing them to a native method.
*/
-#define JRI_NewByteArray(env, length, initialValues) \
+#define JRI_NewByteArray(env, length, initialValues) \
JRI_NewScalarArray(env, length, JRISigByte, (jbyte*)(initialValues))
-#define JRI_GetByteArrayLength(env, array) \
+#define JRI_GetByteArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetByteArrayElements(env, array) \
+#define JRI_GetByteArrayElements(env, array) \
JRI_GetScalarArrayElements(env, array)
-#define JRI_NewCharArray(env, length, initialValues) \
+#define JRI_NewCharArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jchar)), JRISigChar, (jbyte*)(initialValues))
-#define JRI_GetCharArrayLength(env, array) \
+#define JRI_GetCharArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetCharArrayElements(env, array) \
+#define JRI_GetCharArrayElements(env, array) \
((jchar*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewShortArray(env, length, initialValues) \
+#define JRI_NewShortArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jshort)), JRISigShort, (jbyte*)(initialValues))
-#define JRI_GetShortArrayLength(env, array) \
+#define JRI_GetShortArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetShortArrayElements(env, array) \
+#define JRI_GetShortArrayElements(env, array) \
((jshort*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewIntArray(env, length, initialValues) \
+#define JRI_NewIntArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jint)), JRISigInt, (jbyte*)(initialValues))
-#define JRI_GetIntArrayLength(env, array) \
+#define JRI_GetIntArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetIntArrayElements(env, array) \
+#define JRI_GetIntArrayElements(env, array) \
((jint*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewLongArray(env, length, initialValues) \
+#define JRI_NewLongArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jlong)), JRISigLong, (jbyte*)(initialValues))
-#define JRI_GetLongArrayLength(env, array) \
+#define JRI_GetLongArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetLongArrayElements(env, array) \
+#define JRI_GetLongArrayElements(env, array) \
((jlong*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewFloatArray(env, length, initialValues) \
+#define JRI_NewFloatArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jfloat)), JRISigFloat, (jbyte*)(initialValues))
-#define JRI_GetFloatArrayLength(env, array) \
+#define JRI_GetFloatArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetFloatArrayElements(env, array) \
+#define JRI_GetFloatArrayElements(env, array) \
((jfloat*)JRI_GetScalarArrayElements(env, array))
-#define JRI_NewDoubleArray(env, length, initialValues) \
+#define JRI_NewDoubleArray(env, length, initialValues) \
JRI_NewScalarArray(env, ((length) * sizeof(jdouble)), JRISigDouble, (jbyte*)(initialValues))
-#define JRI_GetDoubleArrayLength(env, array) \
+#define JRI_GetDoubleArrayLength(env, array) \
JRI_GetScalarArrayLength(env, array)
-#define JRI_GetDoubleArrayElements(env, array) \
+#define JRI_GetDoubleArrayElements(env, array) \
((jdouble*)JRI_GetScalarArrayElements(env, array))
/******************************************************************************/
@@ -212,7 +212,7 @@ typedef union JRI_JDK_stack_item {
unsigned char *addr;
#ifdef IS_64
double d;
- long l; /* == 64bits! */
+ long l; /* == 64bits! */
#endif
} JRI_JDK_stack_item;