summaryrefslogtreecommitdiff
path: root/dmake/expand.c
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-03-25 13:05:43 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-03-25 13:05:43 +0000
commitb57fee8153ab7bb8a2fdc2a12a5ccc0c0927d6f4 (patch)
tree74114259b652f32d411bca938e8946a654544ab3 /dmake/expand.c
parente0ac98f6d945aa23617e5f5174ef16287fb985a0 (diff)
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'dmake/expand.c')
-rw-r--r--dmake/expand.c65
1 files changed, 62 insertions, 3 deletions
diff --git a/dmake/expand.c b/dmake/expand.c
index b6321845800f..421a17cc0657 100644
--- a/dmake/expand.c
+++ b/dmake/expand.c
@@ -1,5 +1,64 @@
-/* RCS $Id: expand.c,v 1.2 2002-10-11 13:42:42 waratah Exp $
---
+/*************************************************************************
+ *
+ * $RCSfile: expand.c,v $
+ *
+ * $Revision: 1.3 $
+ *
+ * last change: $Author: hr $ $Date: 2003-03-25 14:02:10 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source 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.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+/*
-- SYNOPSIS
-- Macro expansion code.
--
@@ -75,7 +134,7 @@
/* Microsoft BRAINDAMAGE ALERT!!!!
* This #ifdef is here only to satisfy stupid bugs in MSC5.0 and MSC5.1
* it isn't needed for anything else. It turns loop optimization off. */
-#if defined(_MSC_VER)
+#if defined(_MSV_VER) && _MSC_VER < 600
#include "optoff.h"
#endif