Skip to content

Commit

Permalink
Solve a section type conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
janhruby committed Jan 20, 2014
1 parent 0b12c6d commit c6ea46d
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions ptpconstitles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ Circuits At Home, LTD
Web : http://www.circuitsathome.com
e-mail : [email protected]
*/

#include "ptpconstitles.h"

const char* ptpopNames[] PROGMEM =
const char* const ptpopNames[] PROGMEM =
{
msgUndefined,
msgGetDeviceInfo,
Expand Down Expand Up @@ -49,7 +50,7 @@ const char* ptpopNames[] PROGMEM =
msgInitiateOpenCapture
};

const char* mtpopNames[] PROGMEM =
const char* const mtpopNames[] PROGMEM =
{
msgUndefined,
msgGetObjectPropsSupported,
Expand All @@ -62,7 +63,7 @@ const char* mtpopNames[] PROGMEM =
msgSendObjectPropList
};

const char* ptpevNames[] PROGMEM =
const char* const ptpevNames[] PROGMEM =
{
msgUndefined,
msgCancelTransaction,
Expand All @@ -81,15 +82,15 @@ const char* ptpevNames[] PROGMEM =
msgUnreportedStatus
};

const char* mtpevNames[] PROGMEM =
const char* const mtpevNames[] PROGMEM =
{
msgUndefined,
msgObjectPropChanged,
msgObjectPropDescChanged,
msgObjectReferencesChanged
};

const char* ptpprNames[] PROGMEM =
const char* const ptpprNames[] PROGMEM =
{
msgUndefined,
msgBatteryLevel,
Expand Down Expand Up @@ -125,7 +126,7 @@ const char* ptpprNames[] PROGMEM =
msgCopyrightInfo
};

const char* mtpprNames[] PROGMEM =
const char* const mtpprNames[] PROGMEM =
{
msgUndefined,
msgSynchronization_Partner,
Expand All @@ -140,7 +141,7 @@ const char* mtpprNames[] PROGMEM =
msgPlayback_Container
};

const char* acNames[] PROGMEM =
const char* const acNames[] PROGMEM =
{
msgUndefined,
msgAssociation,
Expand All @@ -158,7 +159,7 @@ const char* acNames[] PROGMEM =
msgQT
};

const char* imNames[] PROGMEM =
const char* const imNames[] PROGMEM =
{
msgUndefined,
msgEXIF_JPEG,
Expand Down

0 comments on commit c6ea46d

Please sign in to comment.