|
Check-in Number:
|
5634 | |
| Date: |
2006-Aug-03 14:41:27 (local)
2006-Aug-03 12:41:27 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
Be more clean and replace weak "#if JS_HAS_FILE_OBJECT" constructs
with the stronger "#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0)"
as the JS_HAS_FILE_OBJECT can be not defined at all (in contrast to
other JS_HAS_XXXX defines which are all listed in src/jsconfig.h) |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/js/ChangeLog 1.27 -> 1.28
--- ChangeLog 2006/08/03 12:30:15 1.27
+++ ChangeLog 2006/08/03 12:41:27 1.28
@@ -13,6 +13,12 @@
Changes between 1.6.20060731 and 1.6.200608xx (2006-07-31 to 2006-08-xx)
+ o Be more clean and replace weak "#if JS_HAS_FILE_OBJECT" constructs
+ with the stronger "#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0)"
+ as the JS_HAS_FILE_OBJECT can be not defined at all (in contrast to
+ other JS_HAS_XXXX defines which are all listed in src/jsconfig.h)
+ [Ralf S. Engelschall <rse@engelschall.com>]
+
o Fix a bunch of compiler warnings.
[Ralf S. Engelschall <rse@engelschall.com>]
|
|
ossp-pkg/js/configure.ac 1.17 -> 1.18
--- configure.ac 2006/07/31 11:37:56 1.17
+++ configure.ac 2006/08/03 12:41:27 1.18
@@ -135,7 +135,7 @@
[ac_cv_with_file=$withval], [ac_cv_with_file=yes])
AC_CACHE_CHECK([whether to build with the File object], [ac_cv_with_file], [ac_cv_with_file=yes])
if test ".$ac_cv_with_file" = ".yes"; then
- CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT"
+ CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT"
fi
AC_SUBST(CLI_CFLAGS)
|
|
ossp-pkg/js/src/js.c 1.5 -> 1.6
--- js.c 2006/08/03 12:30:16 1.5
+++ js.c 2006/08/03 12:41:28 1.6
@@ -64,7 +64,7 @@
#include "jsscript.h"
#ifdef OSSP
-#if JS_HAS_FILE_OBJECT
+#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
#include "jsfile.h"
#endif
#endif
@@ -2533,7 +2533,7 @@
if (!JS_InitStandardClasses(cx, glob))
return 1;
#ifdef OSSP
-#if JS_HAS_FILE_OBJECT
+#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
if (!js_InitFileClass(cx, glob))
return 1;
#endif
|
|
ossp-pkg/js/src/jsapi.c 1.11 -> 1.12
--- jsapi.c 2006/07/31 17:36:41 1.11
+++ jsapi.c 2006/08/03 12:41:28 1.12
@@ -78,7 +78,7 @@
#include "jsstr.h"
#include "prmjtime.h"
-#if JS_HAS_FILE_OBJECT
+#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
#include "jsfile.h"
#endif
@@ -1212,7 +1212,7 @@
js_InitXMLClasses(cx, obj) &&
#endif
#ifndef OSSP
-#if JS_HAS_FILE_OBJECT
+#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
js_InitFileClass(cx, obj) &&
#endif
#endif
@@ -1255,7 +1255,7 @@
{js_InitNamespaceClass, ATOM_OFFSET(Namespace)},
{js_InitQNameClass, ATOM_OFFSET(QName)},
#endif
-#if JS_HAS_FILE_OBJECT
+#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
{js_InitFileClass, ATOM_OFFSET(File)},
#endif
{NULL, 0}
|
|
ossp-pkg/js/src/jsfile.c 1.11 -> 1.12
--- jsfile.c 2006/08/03 12:30:16 1.11
+++ jsfile.c 2006/08/03 12:41:28 1.12
@@ -41,7 +41,7 @@
/*
* JS File object
*/
-#if JS_HAS_FILE_OBJECT
+#if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
#ifdef OSSP
#include "../config.h"
|
|
ossp-pkg/js/src/jsfile.h -> 1.2
*** /dev/null Mon Apr 29 07:44:00 2024
--- - Mon Apr 29 07:44:48 2024
***************
*** 0 ****
--- 1,50 ----
+ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * 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.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of 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
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+ #ifndef _jsfile_h__
+ #define _jsfile_h__
+
+ #if defined(JS_HAS_FILE_OBJECT) && (JS_HAS_FILE_OBJECT - 0) /* OSSP BUGFIX */
+ extern JS_PUBLIC_API(JSObject*)
+ js_InitFileClass(JSContext *cx, JSObject* obj);
+
+ extern JS_PUBLIC_API(JSObject*)
+ js_NewFileObject(JSContext *cx, char *bytes);
+ #endif /* JS_HAS_FILE_OBJECT */
+ #endif /* _jsfile_h__ */
|
|
