Import Upstream version 10.99.33

1 files changed, 25 insertions, 21 deletions

diff --git a/include/libkmfl.h b/include/libkmfl.h
index af64acd..cb0a83c 100755..100644
--- a/include/libkmfl.h
+++ b/include/libkmfl.h
@@ -1,22 +1,26 @@
 /* libkmfl.h

- * Copyright (C) 2005 SIL International and Tavultesoft Pty Ltd

+ * Copyright (C) 2005 SIL International

  *

  * This file is part of the KMFL library.

  *

- * The KMFL library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU 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 KMFL 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

- * General Public License for more details.

- *

- * You should have received a copy of the GNU General Public

- * License along with the KMFL library; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA

- *

+ * Permission is hereby granted, free of charge, to any person obtaining a copy

+ * of this software and associated documentation files (the "Software"), to deal

+ * in the Software without restriction, including without limitation the rights

+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+ * copies of the Software, and to permit persons to whom the Software is

+ * furnished to do so, subject to the following conditions:

+ * 

+ * The above copyright notice and this permission notice shall be included in all

+ * copies or substantial portions of the Software.

+ * 

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

+ * SOFTWARE.

+ * 

  */

 

 // LIBKMFL.H: Header for interpreter for Keyboard Mapping for Linux

@@ -26,13 +30,13 @@
 #ifdef	__cplusplus

 extern "C" {

 #endif

-	

+

 int kmfl_interpret(KMSI *p_kmsi, UINT key, UINT state);

 

 int kmfl_load_keyboard(const char *file);

-int kmfl_check_keyboard(const char *file);
+int kmfl_check_keyboard(const char *file);

 int kmfl_reload_keyboard(int keyboard_number);

-int kmfl_reload_all_keyboards(void);
+int kmfl_reload_all_keyboards(void);

 int kmfl_unload_keyboard(int keyboard_number);

 int kmfl_unload_all_keyboards(void);

 

@@ -51,14 +55,14 @@ int kmfl_get_header(KMSI *p_kmsi,int hdrID,char *buf,int buflen);
 

 void DBGMSG(int debug,const char *fmt,...);

 void *ERRMSG(const char *fmt,...);

-void clear_history(KMSI *p_kmsi);
+void clear_history(KMSI *p_kmsi);

 int deadkey_in_history(KMSI *p_kmsi);

-void set_history(KMSI *p_kmsi, ITEM * items, UINT nitems);
+void set_history(KMSI *p_kmsi, ITEM * items, UINT nitems);

 

 extern int kmfl_debug;

 

 #ifdef	__cplusplus

 }

-#endif	

+#endif

 

 #endif /* *** end of LIBKMFL.H *** */