1 files changed, 14 insertions, 14 deletions

diff --git a/unsorted/ParserFace.c b/unsorted/ParserFace.c
index 24f3213..a005ece 100644
--- a/unsorted/ParserFace.c
+++ b/unsorted/ParserFace.c
@@ -1,8 +1,8 @@
-#include "mwcc_decomp.h"
+#include "parser.h"
 
 const char *failedCallback;
 jmp_buf exit_plugin;
-struct ParseOptsType parseopts;
+ParseOptsType parseopts;
 
 static CWResult SetupParamBlock(CWPluginContext context) {
     CWResult result;
@@ -136,9 +136,9 @@ CWResult Parser_StorePanels(CWPluginContext context) {
         name = parseopts.panelNames[idx];
         h = Parser_FindPrefPanel(name);
         if (h) {
-            result = CWParserSetNamedPreferences(parseopts.context, name, (CWMemHandle) h);
+            result = CWParserSetNamedPreferences(parseopts.context, name, h);
             if (result) {
-                CLPReportError(68, name);
+                CLPReportError(CLPStr68, name);
                 return result;
             }
         }
@@ -190,10 +190,10 @@ static CWResult StoreResults(CWPluginContext context) {
     return cwNoErr;
 }
 
-short CWParser_GetDropInFlags(const DropInFlags **flags, SInt32 *flagsSize) {
+CWPLUGIN_ENTRY (CWParser_GetDropInFlags)(const DropInFlags **flags, SInt32 *flagsSize) {
     static const DropInFlags sFlags = {
             kCurrentDropInFlagsVersion,
-            CWFOURCHAR('P','a','r','s'),
+            CWDROPINPARSERTYPE,
             7,
             0,
             'Seep',
@@ -204,19 +204,19 @@ short CWParser_GetDropInFlags(const DropInFlags **flags, SInt32 *flagsSize) {
     return 0;
 }
 
-short CWParser_GetDropInName(const char **dropinName) {
+CWPLUGIN_ENTRY (CWParser_GetDropInName)(const char **dropinName) {
     static const char *sDropInName = "Command-Line Parser";
     *dropinName = sDropInName;
     return 0;
 }
 
-short CWParser_GetDisplayName(const char **displayName) {
+CWPLUGIN_ENTRY (CWParser_GetDisplayName)(const char **displayName) {
     static const char *sDisplayName = "Command-Line Parser";
     *displayName = sDisplayName;
     return 0;
 }
 
-short CWParser_GetPanelList(const CWPanelList **panelList) {
+CWPLUGIN_ENTRY (CWParser_GetPanelList)(const CWPanelList **panelList) {
     static CWPanelList sPanelList = {
             kCurrentCWFamilyListVersion,
             0,
@@ -226,7 +226,7 @@ short CWParser_GetPanelList(const CWPanelList **panelList) {
     return 0;
 }
 
-short CWParser_GetTargetList(const CWTargetList **targetList) {
+CWPLUGIN_ENTRY (CWParser_GetTargetList)(const CWTargetList **targetList) {
     static CWDataType sCPU = '****';
     static CWDataType sOS = '****';
     static CWTargetList sTargetList = {
@@ -240,7 +240,7 @@ short CWParser_GetTargetList(const CWTargetList **targetList) {
     return 0;
 }
 
-short CWParser_GetVersionInfo(const VersionInfo **versioninfo) {
+CWPLUGIN_ENTRY (CWParser_GetVersionInfo)(const VersionInfo **versioninfo) {
     static const VersionInfo vi = {
             1, 1, 0, 0
     };
@@ -248,17 +248,17 @@ short CWParser_GetVersionInfo(const VersionInfo **versioninfo) {
     return 0;
 }
 
-short Parser_SupportsPlugin(struct CLPluginInfo *pluginfo, CWDataType cpu, CWDataType os, Boolean *isSupported) {
+CWPLUGIN_ENTRY (Parser_SupportsPlugin)(const struct CLPluginInfo *pluginfo, CWDataType cpu, CWDataType os, Boolean *isSupported) {
     *isSupported = ParserToolMatchesPlugin(pluginfo->plugintype, pluginfo->language, cpu, os);
     return 0;
 }
 
-short Parser_SupportsPanels(int numPanels, const char **panelNames, Boolean *isSupported) {
+CWPLUGIN_ENTRY (Parser_SupportsPanels)(int numPanels, const char **panelNames, Boolean *isSupported) {
     *isSupported = ParserToolHandlesPanels(numPanels, panelNames);
     return 0;
 }
 
-short parser_main(CWPluginContext context) {
+CWPLUGIN_ENTRY (parser_main)(CWPluginContext context) {
     CWResult result;
     SInt32 request;