[vlc-commits] NP*: fix headers and includes order

[Jean-Baptiste Kempf]

npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Apr 23 20:12:32 2014 +0200| [493017b28e9bfd788ef84b60599c18b6a763c4e0] | committer: Jean-Baptiste Kempf

NP*: fix headers and includes order

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=493017b28e9bfd788ef84b60599c18b6a763c4e0
---

 npapi/support/npunix.cpp |   59 ++++++++++++++++------------------------------
 npapi/support/npwin.cpp  |    6 +++--
 2 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/npapi/support/npunix.cpp b/npapi/support/npunix.cpp
index 8a127b7..520b074 100644
--- a/npapi/support/npunix.cpp
+++ b/npapi/support/npunix.cpp
@@ -1,53 +1,34 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * Mozilla/Firefox plugin for VLC
+/*****************************************************************************
+ * npunix.cpp: Unix NPAPI plugin for VLC
+ *****************************************************************************
  * Copyright (C) 2009, Jean-Paul Saman <jpsaman at videolan.org>
+ * Copyright (C) 2012-2013 Felix Paul Kühne <fkuehne # videolan # org>
+ * $Id:$
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Authors: Jean-Paul Saman <jpsaman at videolan.org>
+ *          Felix Paul Kühne <fkuehne # videolan # org>
  *
- * The Original Code is mozilla.org code.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  *
- * 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):
- *   Stephen Mak <smak at sun.com>
- *
- */
-
-/*
- * npunix.c
- *
- * Netscape Client Plugin API
- * - Wrapper function to interface with the Netscape Navigator
- *
- * dp Suresh <dp at netscape.com>
+ * This program 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.
  *
- *----------------------------------------------------------------------
- * PLUGIN DEVELOPERS:
- *  YOU WILL NOT NEED TO EDIT THIS FILE.
- *----------------------------------------------------------------------
- */
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include "../common.h"
+#include "../vlcplugin.h"
 #include "../vlcshell.h"
 
 #include <npapi.h>
diff --git a/npapi/support/npwin.cpp b/npapi/support/npwin.cpp
index 93eab8e..04fff7b 100644
--- a/npapi/support/npwin.cpp
+++ b/npapi/support/npwin.cpp
@@ -30,21 +30,23 @@
 # include "config.h"
 #endif
 
+#include "../common.h"
 #include "../vlcplugin.h"
+#include "../vlcshell.h"
 
+#include <npapi.h>
 #if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
 #include "npupp.h"
 #else
 #include <npfunctions.h>
 #endif
 
-#include "../vlcshell.h"
 
 //\\// DEFINE
 #define NP_EXPORT
 
 //\\// GLOBAL DATA
-NPNetscapeFuncs* gNetscapeFuncs = 0;
+static NPNetscapeFuncs* gNetscapeFuncs;
 
 //\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\.
 ////\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//.