Merge "PackageInfo class incorrectly referenced as a struct." into jellybean (2002f0d1) · Commits · e / os / android_frameworks_base

tools/obbtool/Main.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ void usage(void)
		" Prints the OBB signature information of a file.\n\n", gProgName);
		}

		void doAdd(const char* filename, struct PackageInfo* info) {
		void doAdd(const char* filename, class PackageInfo* info) {
		ObbFile *obb = new ObbFile();
		if (obb->readFrom(filename)) {
		fprintf(stderr, "ERROR: %s: OBB signature already present\n", filename);
		@@ -182,7 +182,7 @@ int main(int argc, char* const argv[])
		{
		int opt;
		int option_index = 0;
		struct PackageInfo package_info;
		class PackageInfo package_info;

		int result = 1; // pessimistically assume an error.