Backed out changeset 5b6c7ace97c4
authorDoug Turner <dougt@meer.net>
Mon, 05 Jan 2009 10:08:00 -0800
changeset 23334 c788b8e5de3d10af67fe4ecf5ffcbcd4399f5f6c
parent 23333 5b6c7ace97c4c7acdfecd0e771d7254b32ee7dce
child 23335 2fb17425c988f9d8cc56a794eab25d74c2624396
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.2a1pre
backs out5b6c7ace97c4c7acdfecd0e771d7254b32ee7dce
Backed out changeset 5b6c7ace97c4 this patch is fine, it just had the wrong comment.
build/wince/shunt/include/windows.h
build/wince/shunt/include/ymath.h
configure.in
deleted file mode 100644
--- a/build/wince/shunt/include/windows.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ***** 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 MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
-
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  John Wolfe <wolfe@lobo.us>
- *
- * 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
- * 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 MOZCE_WINDOWS_H
-#define MOZCE_WINDOWS_H
-#include "mozce_windows_actual_incl.h"
-#ifdef GetProcAddress
-#undef GetProcAddress
-#endif
-#define GetProcAddress GetProcAddressA
-#endif
deleted file mode 100644
--- a/build/wince/shunt/include/ymath.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ***** 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 MOZCE Lib.
- *
- * The Initial Developer of the Original Code is Doug Turner <dougt@meer.net>.
-
- * Portions created by the Initial Developer are Copyright (C) 2008
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  John Wolfe <wolfe@lobo.us>
- *
- * 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
- * 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 MOZCE_YMATH_H
-#define MOZCE_YMATH_H
-#include "mozce_ymath_actual_incl.h"
-#define _FMAX	    ((1 << (15 - _FOFF)) - 1)
-#define _FOFF	    7
-#define _FSIGN    0x8000
-#define INIT(w0)  {w0, 0}
-static const _Dconst _FNanWinCE = {INIT((_FMAX << _FOFF)
-  | (1 << (_FOFF - 1)))};
-#define _FNan _FNanWinCE
-#endif
--- a/configure.in
+++ b/configure.in
@@ -250,18 +250,18 @@ case "$target" in
 
     
     rm -f $srcdir/build/wince/shunt/include/windows.h
 
     echo -n "#define TOPSRCDIR \"" > $srcdir/build/wince/tools/topsrcdir.h
     echo `cd "$_topsrcdir" && pwd -W | tr '\n' '\"'` >> $srcdir/build/wince/tools/topsrcdir.h
     make -C $srcdir/build/wince/tools
     
-    echo "#include \"$WINCE_SDK/windows.h\"" > $srcdir/build/wince/shunt/include/mozce_windows_actual_incl.h
-    echo "#include \"$WINCE_SDK/ymath.h\""   > $srcdir/build/wince/shunt/include/mozce_ymath_actual_incl.h
+    echo "#include \"$WINCE_SDK/windows.h\"" > $srcdir/build/wince/shunt/include/windows.h
+    echo "#define GetProcAddress GetProcAddressA" >> $srcdir/build/wince/shunt/include/windows.h
     echo -----------------------------------------------------------------------------
 
     ;;
 esac
 
 if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
     echo "cross compiling from $host to $target"
     cross_compiling=yes