Skip to content

oc2: Rename macro to fix unity build #3347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WardF merged 1 commit into from
Apr 7, 2026
+2 −2
Merged

oc2: Rename macro to fix unity build #3347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions oc2/occompile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ ocxdrsize(OCtype etype, int isscalar)
return 0;
}

#define tag "Error {\n"
#define OC_ERROR_TAG "Error {\n"

static int
ocerrorstring(XXDR* xdrs)
Expand All @@ -455,7 +455,7 @@ ocerrorstring(XXDR* xdrs)
MEMCHECK(data,0);
if(!xxdr_opaque(xdrs,data,avail)) {free(data); return 0;}
/* check for error tag at front */
if(ocstrncmp(data,tag,sizeof(tag))==0) {
if(ocstrncmp(data,OC_ERROR_TAG,sizeof(OC_ERROR_TAG))==0) {
char* p;
if((p=strchr(data,'}')) != NULL) *(++p)='\0';
nclog(NCLOGERR,"Server error: %s",data);
Expand Down
Loading