Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / cc65 / incpath.h

diff --git a/src/cc65/incpath.h b/src/cc65/incpath.h
index 26ab52f45a7388a119e0865983386c2a77df69c6..05824ac5e8fe29858b406f0002a2b943c06dd513 100644 (file)
--- a/src/cc65/incpath.h
+++ b/src/cc65/incpath.h
@@ -1,12 +1,12 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                incpath.h                                 */
+/*                                 incpath.h                                 */
 /*                                                                           */
-/*                     Include path handling for cc65                       */
+/*                      Include path handling for cc65                       */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2009, Ullrich von Bassewitz                                      */
+/* (C) 2000-2013, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -38,41 +38,36 @@
 
 
 
+/* common */
+#include "searchpath.h"
+
+
+
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
 
-#define INC_SYS                0x0001          /* Add to system include path */
-#define INC_USER       0x0002          /* Add to user include path */
+extern SearchPaths*     SysIncSearchPath;       /* System include path */
+extern SearchPaths*     UsrIncSearchPath;       /* User include path */
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
 
-void AddIncludePath (const char* NewPath, unsigned Where);
-/* Add a new include path to the existing one */
-
-char* FindInclude (const char* Name, unsigned Where);
-/* Find an include file. Return a pointer to a malloced area that contains
- * the complete path, if found, return 0 otherwise.
- */
-
-void ForgetAllIncludePaths (void);
-/* Remove all include search paths. */
-
 void InitIncludePaths (void);
 /* Initialize the include path search list */
 
+void FinishIncludePaths (void);
+/* Finish creating the include path search lists. */
 
 
-/* End of incpath.h */
-#endif
-
 
+/* End of incpath.h */
 
+#endif