[Pmplib-commits] SF.net SVN: pmplib: [316] trunk/pmplib

[<ny...@us...>]

Revision: 316
          http://svn.sourceforge.net/pmplib/?rev=316&view=rev
Author:   nyaochi
Date:     2007-02-08 18:29:45 -0800 (Thu, 08 Feb 2007)

Log Message:
-----------
Moved exportable include files into /include/pmplib directory:
<ucs2char.h> -> <pmplib/ucs2char.h>
<filepath.h> -> <pmplib/filepath.h>
<pmp.h> -> <pmplib/pmp.h>

Added <pmplib/os_types.h>

Modified Paths:
--------------
    trunk/pmplib/frontend/easypmp/common/database.c
    trunk/pmplib/frontend/easypmp/common/enumerate.c
    trunk/pmplib/frontend/easypmp/common/playlist.c
    trunk/pmplib/frontend/easypmp/cui/console_win32.c
    trunk/pmplib/frontend/easypmp/cui/device.c
    trunk/pmplib/frontend/easypmp/cui/main.c
    trunk/pmplib/frontend/easypmp/cui/option.c
    trunk/pmplib/frontend/easypmp/cui/util.c
    trunk/pmplib/frontend/easypmp/win32gui/winmain.cpp
    trunk/pmplib/include/gmi.h
    trunk/pmplib/include/os.h
    trunk/pmplib/include/playlist.h
    trunk/pmplib/include/pmplib/filepath.h
    trunk/pmplib/lib/filepath/filepath_win32.c
    trunk/pmplib/lib/gmi/gmi.c
    trunk/pmplib/lib/gmi/gmi_mp3.c
    trunk/pmplib/lib/gmi/gmi_vorbis.c
    trunk/pmplib/lib/gmi/gmi_wav.c
    trunk/pmplib/lib/gmi/gmi_wma.c
    trunk/pmplib/lib/playlist/jspl.c
    trunk/pmplib/lib/playlist/playlist.c
    trunk/pmplib/lib/playlist/rw_m3u.c
    trunk/pmplib/lib/playlist/rw_pls.c
    trunk/pmplib/lib/pmp/pmp.c
    trunk/pmplib/lib/pmp/pmp.vcproj
    trunk/pmplib/lib/pmp/pmp_win32.c
    trunk/pmplib/lib/pmp_iriverplus2/dat.c
    trunk/pmplib/lib/pmp_iriverplus2/idx.c
    trunk/pmplib/lib/pmp_iriverplus2/idx_descriptor.c
    trunk/pmplib/lib/pmp_iriverplus2/idx_exports.c
    trunk/pmplib/lib/pmp_iriverplus2/idx_header.c
    trunk/pmplib/lib/pmp_iriverplus2/idx_leaf.c
    trunk/pmplib/lib/pmp_iriverplus2/idx_node.c
    trunk/pmplib/lib/pmp_iriverplus2/ip2db.c
    trunk/pmplib/lib/pmp_iriverplus2/ip2db.h
    trunk/pmplib/lib/pmp_iriverplus2/ip2db_dat.c
    trunk/pmplib/lib/pmp_iriverplus2/ip2db_idx.c
    trunk/pmplib/lib/pmp_iriverplus2/playlist.c
    trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c
    trunk/pmplib/lib/pmp_iriverplus2/serialize.c
    trunk/pmplib/lib/pmp_iriverplus2/util.c
    trunk/pmplib/lib/pmp_iriverplus3/dat.c
    trunk/pmplib/lib/pmp_iriverplus3/dic.c
    trunk/pmplib/lib/pmp_iriverplus3/idx.c
    trunk/pmplib/lib/pmp_iriverplus3/ip3db.c
    trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c
    trunk/pmplib/lib/pmp_iriverplus3/serialize.c
    trunk/pmplib/lib/pmp_iriverplus3/util.c
    trunk/pmplib/lib/pmp_irivnavi/irivnavi.c
    trunk/pmplib/lib/pmp_irivnavi/playlist.c
    trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c
    trunk/pmplib/lib/pmp_irivnavi/serialize.c
    trunk/pmplib/lib/pmp_portalplayer1/dat.c
    trunk/pmplib/lib/pmp_portalplayer1/field_descriptor.c
    trunk/pmplib/lib/pmp_portalplayer1/hdr.c
    trunk/pmplib/lib/pmp_portalplayer1/hdr_template.c
    trunk/pmplib/lib/pmp_portalplayer1/idx.c
    trunk/pmplib/lib/pmp_portalplayer1/model_iriver_h10.c
    trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke220.c
    trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke440.c
    trunk/pmplib/lib/pmp_portalplayer1/model_msi_megaplayer.c
    trunk/pmplib/lib/pmp_portalplayer1/model_philips_hdd6320.c
    trunk/pmplib/lib/pmp_portalplayer1/model_samsung.c
    trunk/pmplib/lib/pmp_portalplayer1/model_sirius_s50.c
    trunk/pmplib/lib/pmp_portalplayer1/playlist.c
    trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c
    trunk/pmplib/lib/pmp_portalplayer1/pp1db.c
    trunk/pmplib/lib/pmp_portalplayer1/pp1db.h
    trunk/pmplib/lib/pmp_portalplayer1/serialize.c
    trunk/pmplib/lib/pmp_portalplayer1/util.c
    trunk/pmplib/lib/ucs2/ucs2char.c
    trunk/pmplib/lib/ucs2/ucs2char_iconv.c
    trunk/pmplib/lib/ucs2/ucs2char_win32.c

Added Paths:
-----------
    trunk/pmplib/include/pmplib/os_types.h

Modified: trunk/pmplib/frontend/easypmp/common/database.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/database.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/frontend/easypmp/common/database.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -33,9 +33,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 #include <gmi.h>
 #include <easypmp.h>
 

Modified: trunk/pmplib/frontend/easypmp/common/enumerate.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/enumerate.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/frontend/easypmp/common/enumerate.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -32,10 +32,10 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 #include <playlist.h>
-#include <pmp.h>
+#include <pmplib/pmp.h>
 
 #include <easypmp.h>
 

Modified: trunk/pmplib/frontend/easypmp/common/playlist.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/playlist.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/frontend/easypmp/common/playlist.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -29,9 +29,9 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 #include <playlist.h>
 
 #include <easypmp.h>

Modified: trunk/pmplib/frontend/easypmp/cui/console_win32.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/console_win32.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/frontend/easypmp/cui/console_win32.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -20,7 +20,7 @@
  *
  */
 
-/* $Id:$ */
+/* $Id$ */
 
 #ifdef  HAVE_CONFIG_H
 #include <config.h>
@@ -30,7 +30,7 @@
 #include <io.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include <windows.h>
 

Modified: trunk/pmplib/frontend/easypmp/cui/device.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/device.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/frontend/easypmp/cui/device.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -29,9 +29,9 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 
 #include "util.h"
 

Modified: trunk/pmplib/frontend/easypmp/cui/main.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/main.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/frontend/easypmp/cui/main.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -37,10 +37,10 @@
 #include <direct.h>		/* getcwd() */
 #endif/*_MSC_VER*/
 
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 #include <gmi.h>
-#include <pmp.h>
+#include <pmplib/pmp.h>
 #include <easypmp.h>
 
 #include "option.h"

Modified: trunk/pmplib/frontend/easypmp/cui/option.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/option.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/frontend/easypmp/cui/option.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -36,10 +36,10 @@
 #include <direct.h>		/* getcwd() */
 #endif/*_MSC_VER*/
 
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 #include <gmi.h>
-#include <pmp.h>
+#include <pmplib/pmp.h>
 
 #ifdef	HAVE_GETOPT_H
 #include <getopt.h>

Modified: trunk/pmplib/frontend/easypmp/cui/util.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/util.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/frontend/easypmp/cui/util.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -41,7 +41,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "util.h"
 #include "console.h"

Modified: trunk/pmplib/frontend/easypmp/win32gui/winmain.cpp
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/winmain.cpp	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/frontend/easypmp/win32gui/winmain.cpp	2007-02-09 02:29:45 UTC (rev 316)
@@ -27,10 +27,10 @@
 #include "resource.h"
 
 #include <os.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 #include <gmi.h>
-#include <pmp.h>
+#include <pmplib/pmp.h>
 #include <easypmp.h>
 
 #include "ejectdevice.h"

Modified: trunk/pmplib/include/gmi.h
===================================================================
--- trunk/pmplib/include/gmi.h	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/include/gmi.h	2007-02-09 02:29:45 UTC (rev 316)
@@ -35,7 +35,7 @@
 extern "C" {
 #endif/*__cplusplus*/
 
-#include <pmp.h>
+#include <pmplib/pmp.h>
 
 /**
  * \addtogroup gmi

Modified: trunk/pmplib/include/os.h
===================================================================
--- trunk/pmplib/include/os.h	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/include/os.h	2007-02-09 02:29:45 UTC (rev 316)
@@ -33,25 +33,9 @@
 #endif/*_MSC_VER*/
 
 #include <stdio.h>
+#include <pmplib/os_types.h>
 
-#if		defined(WIN32) || defined(OS2)
-typedef unsigned char	uint8_t;
-typedef unsigned int	uint32_t;
-typedef int				int32_t;
-typedef unsigned short	uint16_t;
 
-#elif	defined(bsdi) || defined(FREEBSD) || defined(OPENBSD)
-#include <sys/types.h>
-
-#else	
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#endif
-
 #if		defined(WIN32)
 #define	fileno		_fileno
 #define	strnicmp	_strnicmp
@@ -92,6 +76,4 @@
 
 #endif
 
-typedef int result_t;
-
 #endif/*__OS_H__*/

Modified: trunk/pmplib/include/playlist.h
===================================================================
--- trunk/pmplib/include/playlist.h	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/include/playlist.h	2007-02-09 02:29:45 UTC (rev 316)
@@ -30,7 +30,7 @@
 #define	PLAYLISTAPI
 #endif
 
-#include <pmp.h>
+#include <pmplib/pmp.h>
 
 #ifdef	__cplusplus
 extern "C" {

Modified: trunk/pmplib/include/pmplib/filepath.h
===================================================================
--- trunk/pmplib/include/pmplib/filepath.h	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/include/pmplib/filepath.h	2007-02-09 02:29:45 UTC (rev 316)
@@ -25,7 +25,7 @@
 #define	__FILEPATHUTIL_H__
 
 #include <time.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #ifdef	FILEPATH_EXPORTS
 #define	FILEPATHAPI	__declspec(dllexport)

Added: trunk/pmplib/include/pmplib/os_types.h
===================================================================
--- trunk/pmplib/include/pmplib/os_types.h	                        (rev 0)
+++ trunk/pmplib/include/pmplib/os_types.h	2007-02-09 02:29:45 UTC (rev 316)
@@ -0,0 +1,43 @@
+/*
+ *      Basic type definitions among operating systems and compilers.
+ *
+ *      Copyright (c) 2005-2006 Nyaochi
+ *
+ * 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 St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ */
+
+/* $Id:$ */
+
+#ifndef	__OS_TYPES_H__
+#define	__OS_TYPES_H__
+
+#if		defined(__GNU_C__)
+#include <inttypes.h>
+
+#elif	defined(bsdi) || defined(FREEBSD) || defined(OPENBSD)
+#include <sys/types.h>
+
+#else
+typedef unsigned char	uint8_t;
+typedef unsigned int	uint32_t;
+typedef int				int32_t;
+typedef unsigned short	uint16_t;
+
+#endif
+
+typedef int result_t;
+
+#endif/*__OS_TYPES_H__*/


Property changes on: trunk/pmplib/include/pmplib/os_types.h
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: trunk/pmplib/lib/filepath/filepath_win32.c
===================================================================
--- trunk/pmplib/lib/filepath/filepath_win32.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/filepath/filepath_win32.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -33,7 +33,7 @@
 #include <windows.h>
 #include <shlwapi.h>
 
-#include <filepath.h>
+#include <pmplib/filepath.h>
 #pragma comment(lib, "shlwapi.lib")
 
 int find_file(const ucs2char_t* path, int recursive, filepath_findfile_callback callback, void *instance)

Modified: trunk/pmplib/lib/gmi/gmi.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/gmi/gmi.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -28,8 +28,8 @@
 #endif/*HAVE_CONFIG_H*/
 
 #include <os.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 #include <gmi.h>
 
 /**

Modified: trunk/pmplib/lib/gmi/gmi_mp3.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi_mp3.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/gmi/gmi_mp3.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 #include <gmi.h>
 
 #include <id3tag.h>

Modified: trunk/pmplib/lib/gmi/gmi_vorbis.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi_vorbis.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/gmi/gmi_vorbis.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 #include <gmi.h>
 
 #include <vorbis/codec.h>

Modified: trunk/pmplib/lib/gmi/gmi_wav.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi_wav.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/gmi/gmi_wav.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 #include <gmi.h>
 
 /**

Modified: trunk/pmplib/lib/gmi/gmi_wma.c
===================================================================
--- trunk/pmplib/lib/gmi/gmi_wma.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/gmi/gmi_wma.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 #include <gmi.h>
 
 /** 

Modified: trunk/pmplib/lib/playlist/jspl.c
===================================================================
--- trunk/pmplib/lib/playlist/jspl.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/playlist/jspl.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -32,9 +32,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 #include <playlist.h>
 
 #include <jsapi.h>

Modified: trunk/pmplib/lib/playlist/playlist.c
===================================================================
--- trunk/pmplib/lib/playlist/playlist.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/playlist/playlist.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -32,10 +32,10 @@
 #include <string.h>
 #endif/*HAVE_STRING_H*/
 #include <time.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 #include <playlist.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 
 static const ucs2char_t ucs2cs_m3u[] = {'.','m','3','u',0};
 static const ucs2char_t ucs2cs_m3u8[] = {'.','m','3','u','8',0};

Modified: trunk/pmplib/lib/playlist/rw_m3u.c
===================================================================
--- trunk/pmplib/lib/playlist/rw_m3u.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/playlist/rw_m3u.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #ifdef	HAVE_STRING_H
 #include <string.h>
 #endif/*HAVE_STRING_H*/
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 #include <playlist.h>
 
 static char *strip(char *line)

Modified: trunk/pmplib/lib/playlist/rw_pls.c
===================================================================
--- trunk/pmplib/lib/playlist/rw_pls.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/playlist/rw_pls.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 #include <playlist.h>
 
 static char *strip(char *line)

Modified: trunk/pmplib/lib/pmp/pmp.c
===================================================================
--- trunk/pmplib/lib/pmp/pmp.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp/pmp.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <string.h>
 #endif/*HAVE_STRING_H*/
 
-#include <ucs2char.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/pmp.h>
 
 void pmplib_record_init(pmp_music_record_t* record)
 {

Modified: trunk/pmplib/lib/pmp/pmp.vcproj
===================================================================
--- trunk/pmplib/lib/pmp/pmp.vcproj	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp/pmp.vcproj	2007-02-09 02:29:45 UTC (rev 316)
@@ -196,6 +196,14 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath="..\..\include\os.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\pmplib\os_types.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\pmp.h"
 				>
 			</File>

Modified: trunk/pmplib/lib/pmp/pmp_win32.c
===================================================================
--- trunk/pmplib/lib/pmp/pmp_win32.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp/pmp_win32.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -27,12 +27,12 @@
 #endif/*HAVE_CONFIG_H*/
 
 #include <os.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include <windows.h>
 
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 
 struct tag_pmplib_t {
 	uint32_t num_plugins;

Modified: trunk/pmplib/lib/pmp_iriverplus2/dat.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/dat.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/dat.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "util.h"
 #include "serialize.h"

Modified: trunk/pmplib/lib/pmp_iriverplus2/idx.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/idx.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/idx.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/pmp.h>
 
 #include "util.h"
 #include "serialize.h"

Modified: trunk/pmplib/lib/pmp_iriverplus2/idx_descriptor.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/idx_descriptor.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/idx_descriptor.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "ip2db.h"
 

Modified: trunk/pmplib/lib/pmp_iriverplus2/idx_exports.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/idx_exports.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/idx_exports.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -28,7 +28,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "ip2db.h"
 

Modified: trunk/pmplib/lib/pmp_iriverplus2/idx_header.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/idx_header.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/idx_header.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "util.h"
 #include "serialize.h"

Modified: trunk/pmplib/lib/pmp_iriverplus2/idx_leaf.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/idx_leaf.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/idx_leaf.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "util.h"
 #include "serialize.h"

Modified: trunk/pmplib/lib/pmp_iriverplus2/idx_node.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/idx_node.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/idx_node.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "util.h"
 #include "serialize.h"

Modified: trunk/pmplib/lib/pmp_iriverplus2/ip2db.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/ip2db.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/ip2db.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,9 +31,9 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 
 #include "util.h"
 #include "ip2db.h"

Modified: trunk/pmplib/lib/pmp_iriverplus2/ip2db.h
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/ip2db.h	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/ip2db.h	2007-02-09 02:29:45 UTC (rev 316)
@@ -24,7 +24,7 @@
 #ifndef	__IP2DB_IP2DB_H__
 #define	__IP2DB_IP2DB_H__
 
-#include <pmp.h>
+#include <pmplib/pmp.h>
 
 
 #define	PAGESIZE				0x400

Modified: trunk/pmplib/lib/pmp_iriverplus2/ip2db_dat.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/ip2db_dat.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/ip2db_dat.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -27,8 +27,8 @@
 
 #include <os.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/pmp.h>
 
 #include "util.h"
 #include "ip2db.h"

Modified: trunk/pmplib/lib/pmp_iriverplus2/ip2db_idx.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/ip2db_idx.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/ip2db_idx.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "util.h"
 #include "serialize.h"

Modified: trunk/pmplib/lib/pmp_iriverplus2/playlist.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/playlist.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/playlist.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "serialize.h"
 #include "ip2db.h"

Modified: trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/pmp_iriverplus2.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,9 +31,9 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 
 #include "ip2db.h"
 

Modified: trunk/pmplib/lib/pmp_iriverplus2/serialize.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/serialize.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/serialize.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -30,7 +30,7 @@
 
 #include <os.h>
 #include <stddef.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 

Modified: trunk/pmplib/lib/pmp_iriverplus2/util.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/util.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus2/util.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "util.h"
 

Modified: trunk/pmplib/lib/pmp_iriverplus3/dat.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/dat.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus3/dat.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_iriverplus3/dic.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/dic.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus3/dic.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_iriverplus3/idx.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/idx.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus3/idx.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -46,7 +46,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_iriverplus3/ip3db.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/ip3db.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus3/ip3db.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -28,8 +28,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "util.h"
 #include "ip3db.h"

Modified: trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus3/pmp_iriverplus3.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,9 +31,9 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 
 #include "ip3db.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_iriverplus3/serialize.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/serialize.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus3/serialize.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -28,7 +28,7 @@
 #include <os.h>
 #include <memory.h>
 #include <stddef.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 

Modified: trunk/pmplib/lib/pmp_iriverplus3/util.c
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/util.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_iriverplus3/util.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 #include <malloc.h>
 
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_irivnavi/irivnavi.c
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/irivnavi.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_irivnavi/irivnavi.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/pmp.h>
 
 #include "serialize.h"
 #include "irivnavi.h"

Modified: trunk/pmplib/lib/pmp_irivnavi/playlist.c
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/playlist.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_irivnavi/playlist.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -37,8 +37,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "irivnavi.h"
 

Modified: trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_irivnavi/pmp_irivnavi.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -33,9 +33,9 @@
 #include <stdlib.h>
 #endif/*HAVE_STDLIB_H*/
 #include <stddef.h>
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 
 #include "irivnavi.h"
 

Modified: trunk/pmplib/lib/pmp_irivnavi/serialize.c
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/serialize.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_irivnavi/serialize.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -30,7 +30,7 @@
 
 #include <os.h>
 #include <stddef.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 

Modified: trunk/pmplib/lib/pmp_portalplayer1/dat.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/dat.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/dat.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/field_descriptor.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/field_descriptor.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/field_descriptor.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/hdr.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/hdr.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/hdr.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/hdr_template.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/hdr_template.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/hdr_template.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,7 +31,7 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "pp1db.h"
 #include "hdr_template.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/idx.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/idx.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/idx.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/pmp.h>
 
 #include "serialize.h"
 #include "pp1db.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/model_iriver_h10.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_iriver_h10.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_iriver_h10.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke220.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke220.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke220.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke440.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke440.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_medion_mdjuke440.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -28,8 +28,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/model_msi_megaplayer.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_msi_megaplayer.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_msi_megaplayer.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/model_philips_hdd6320.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_philips_hdd6320.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_philips_hdd6320.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/model_samsung.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_samsung.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_samsung.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,8 +31,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/model_sirius_s50.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/model_sirius_s50.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/model_sirius_s50.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -28,8 +28,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "serialize.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/playlist.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/playlist.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/playlist.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -28,8 +28,8 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
 
 #include "serialize.h"
 #include "pp1db.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/pmp_portalplayer1.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,9 +31,9 @@
 #ifdef	HAVE_STRING_H
 #include <string.h>
 #endif/*HAVE_STRING_H*/
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 
 #include "pp1db.h"
 #include "hdr_template.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/pp1db.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/pp1db.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/pp1db.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -31,9 +31,9 @@
 #include <os.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ucs2char.h>
-#include <filepath.h>
-#include <pmp.h>
+#include <pmplib/ucs2char.h>
+#include <pmplib/filepath.h>
+#include <pmplib/pmp.h>
 
 #include "pp1db.h"
 #include "util.h"

Modified: trunk/pmplib/lib/pmp_portalplayer1/pp1db.h
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/pp1db.h	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/pp1db.h	2007-02-09 02:29:45 UTC (rev 316)
@@ -24,7 +24,7 @@
 #ifndef	__PP1DB_H__
 #define	__PP1DB_H__
 
-#include <pmp.h>
+#include <pmplib/pmp.h>
 
 #define	PP1DB_PATHLENGTH		0x100		/**< Maximum length of path/file name. */
 

Modified: trunk/pmplib/lib/pmp_portalplayer1/serialize.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/serialize.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/serialize.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -30,7 +30,7 @@
 
 #include <os.h>
 #include <stddef.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "serialize.h"
 

Modified: trunk/pmplib/lib/pmp_portalplayer1/util.c
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/util.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/pmp_portalplayer1/util.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include "util.h"
 

Modified: trunk/pmplib/lib/ucs2/ucs2char.c
===================================================================
--- trunk/pmplib/lib/ucs2/ucs2char.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/ucs2/ucs2char.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -29,7 +29,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 /** 
  * \addtogroup ucs2 

Modified: trunk/pmplib/lib/ucs2/ucs2char_iconv.c
===================================================================
--- trunk/pmplib/lib/ucs2/ucs2char_iconv.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/ucs2/ucs2char_iconv.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #include <iconv.h>
 

Modified: trunk/pmplib/lib/ucs2/ucs2char_win32.c
===================================================================
--- trunk/pmplib/lib/ucs2/ucs2char_win32.c	2007-02-09 01:55:34 UTC (rev 315)
+++ trunk/pmplib/lib/ucs2/ucs2char_win32.c	2007-02-09 02:29:45 UTC (rev 316)
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ucs2char.h>
+#include <pmplib/ucs2char.h>
 
 #ifdef	_WIN32
 #include <windows.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.